login form added
Merge branch 'master' into lindsey

Conflicts:
	app/routes.php