fix
Merge branch 'origin/feature-login-directive'

Conflicts:
	app/js/bootstrap/app.js
	app/js/directives/cameo-login.js