Force angular version
Remove sass
Sync messages
Merge origin/master

Conflicts:
	app/css/app.css.map
	app/index.html
Merge origin/master

Conflicts:
	app/css/app.css.map
	app/index.html