re-order football tables
resolve merge conflicts and reorder tables
re add international friendlies
Merge pull request #7536 from guardian/football-reorder-tables

Football reorder tables