tidy
Get changes to generate.sh from master
re-factor for tournament_stage's and separate scheduling modules
run ./generate.sh
Merge branch 'clean2'

Conflicts:
	app/models/team.rb
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb
Merge remote-tracking branch 'origin/master'