Put the login form on a seperate page.
Merge branch 'master' into issue-2

Conflicts:
	app.js