Remove tests causing a SocketException
Remove football app
Merge branch 'master' of github.com:guardian/frontend into football-into-sport

Conflicts:
	facia-tool/test/SwitchboardFeatureTest.scala
	football/app/conf/context.scala
	football/app/controllers/CompetitionListController.scala
	football/app/controllers/CompetitionTablesController.scala
	football/app/controllers/FixturesController.scala
	football/app/controllers/FrontScoresController.scala
	football/app/controllers/LeagueTableController.scala
	football/app/controllers/LiveMatchesController.scala
	football/app/controllers/MatchController.scala
	football/app/controllers/MoreOnMatchController.scala
	football/app/controllers/ResultsController.scala
	football/conf/routes
	football/test/controllers/CompetitionListControllerTest.scala
	football/test/controllers/LeagueTableControllerTest.scala
	football/test/controllers/LiveMatchesControllerTest.scala
	project/Frontend.scala
Merge pull request #1747 from guardian/football-into-sport

Remove football app