Transform (simplify) ghost team names
Merge remote-tracking branch 'origin/competition-stages-wallchart' into competition-stages-wallchart

Conflicts:
	sport/app/football/views/wallchart/knockoutMatch.scala.html