new color scheme
bumped version number
Merge branch 'release/v1.2' into dev
Merge branch 'dev' into feature/manage

Conflicts:
	app/scripts/services.js