More login stuff
Merge branch 'master' of https://github.com/tallmypeople/web-client

Conflicts:
	app/index.html