FUCK YES LOGIN WORKS
Fixes conflicts
Merge remote-tracking branch 'origin/scanner_layout' into scanner_layout

Conflicts:
	app/controllers/users/registrations_controller.rb