Working login process
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/scripts/app.js
	app/styles/main.css
	app/views/login/index.html