Extra for user
Merge branch 'master' of https://github.com/vanhoofseppe/firstmodel

Conflicts:
	app/controllers/registrations_controller.rb