Merge branch 'fightcard' into sc2jsonhunt
Merge branch 'fightcard' into sc2jsonhunt
Merge branch 'sc2jsonhunt'
final merge