fixed grunt-express error
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/index.html
	app/sass/main.scss
	app/styles/main.css
	app/styles/main.css.map
fixed grunt-express error