Added conflict resolving tool and TournPair UI change
* Conflicts will be listed now in admin settings
* Changed look of match submission page
  * editable by tournament admin
  * only shows score for people unrelated to pairing
merge conflicts from master
Fixed match submit bug due to refactoring
Merge pull request #423 from YiboDuan/matchconflict

Matchconflict