login
Merge branch 'master' into 426pm

Conflicts:
	app/views/user/login.erb