Participant status, controller fix
Merge branch 'division_team_registration' of https://github.com/elisapp/elis into division_team_registration

Conflicts:
	app/controllers/participants_controller.rb
	app/views/participants/new.html.erb