modify gruntfile
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/sass/main.scss
modify gruntfile