updata
Merge remote-tracking branch 'wangyun/master'

Conflicts:
	Gruntfile.js