Added support for new ImageServer
Merge branch 'master' of github.com:guardian/frontend into image-service

Conflicts:
	common/app/conf/switches.scala
Merge branch 'master' of github.com:guardian/frontend into image-service

Conflicts:
	common/app/conf/switches.scala
Merge pull request #2974 from guardian/image-service

Added support for new ImageServer