login
Merge branch 'devise'
Merge branch 'master' of github.com:a-plus-plus/aktivator

Conflicts:
	config/routes.rb