Participant.status
Participant.update_attributes
participant_fix
Participant_feature_fix
Merge branch 'master' into participant_registration

Conflicts:
	app/models/participant.rb
Merge pull request #36 from elisapp/participant_registration

Participant registration