Fixed login
Merge branch 'master' of github.com:haraldringvold/rubyreg

Conflicts:
	config/initializers/sorcery.rb