Fix bower problems
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/index.html
	app/scripts/app.js