Merge branch 'diversity' of github.com:Dacilndak/eventreg
* BUGFIX
Merge branch 'master' of github.com:Dacilndak/eventreg
* Whooo...
Conflicts:
	app/controllers/user_controller.rb