Small Layout Update
Add views for authentication
Update for authentication
Merge branch 'master' into dev

Conflicts:
	app/routes.php