Grunt backend
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Grunt backend
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	package.json
Grunt backend
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Gruntfile.coffee
	app/index.html
	package.json
Grunt backend