Merge pull request #138 from glenwks/master

edit layout in manage tournament
Merge remote-tracking branch 'upstream2/master'