Updated views, removed root login page.
Merge branch 'master' into login-strategies

Conflicts:
	app.js
Added facebook login.