login fix
Merge branch 'master' of github.com:fetsite/fetsite

Conflicts:
	app/controllers/application_controller.rb