Added Facebook Login button
Merge branch 'facebookLogin' into loginScreen

Conflicts:
	app/client/views/login.html