Image server frontend switch
Merge branch 'master' of github.com:guardian/frontend-admin into image-server-switch

Conflicts:
	app/controllers/SwitchboardController.scala
Merge pull request #126 from guardian/image-server-switch

Image server frontend switch