Login-view finished!
Login-view finished!
Merge origin/master

Conflicts:
	app/styles/main.css