division_team_features and steps
division_team to participant
parts of controller and view
Participant failure corrections
Merge branch 'master' into division_team_registration
add new tournament team
Status select
Merge branch 'master' into division_team_registration

Conflicts:
	db/seeds.rb
new_tournament_team views, controller
Participant status, controller fix
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
Participant destroy
Merge branch 'division_team_registration' of https://github.com/elisapp/elis into division_team_registration

Conflicts:
	app/controllers/participants_controller.rb
Resolve version conflicts
Merge branch 'master' into division_team_registration
edit tournament team
Add patch tournament team to API
Merge pull request #22 from elisapp/api_patch_team

Add patch tournament team to API
Prepare for merge