Modify settings sample
Fix admin
Merge branch 'master' into add_backbone

Conflicts:
	app/models/match.rb