Passing all model tests.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/models/match.rb
	app/models/player.rb