Removed FOOTBALL_ROUND field from templates

In support of GIA-2468

FOOTBALL_COMPETITION will now hold the competitionDisplayName, which includes the round name if appropriate