Fix tournament view/change view.(#10)
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/tournament.js