Merge branch 'master' of github.com:guardian/frontend into gallery-lightbox

* 'master' of github.com:guardian/frontend: (164 commits)
  tests readability improvements
  Add cache header and check over-by-over tag
  Remove old unnecessary test
  Make gallery meta data member of class not method
  Only try show lightbox if this is actually a gallery
  Refactor gallery most popular tests
  Remove accidental file addition
  Add incline critical css switch state to css loading conditional logic in <head>
  Rename inline critical css switch
  Add a full scorecard link
  Add summary to cricket live blogs
  Remove result caption
  Throttle pa cricket calls
  Add test for gallery most viewed endpoint
  Ensure gallery most popular is progressively enhanced
  Refactor gallery trails and icons
  Refactor gallery most popular to use new ophan endpoint using an agent
  complete revert
  older version
  Move Controller to dev-build
  ...

Conflicts:
	common/app/assets/javascripts/bootstraps/gallery.js
	common/app/assets/javascripts/modules/gallery/lightbox.js
Merge branch 'gallery-lightbox' of github.com:guardian/frontend into gallery-lightbox

* 'gallery-lightbox' of github.com:guardian/frontend:
  Fix more merge conflicts
  Use Exceptions
  There is now an HTTPS endpoint for Teamcity
  Revert "Revert "Added teamcity widget to radiator""
  Make the cricket api key optional
  Fix Broken Test Fixtures
  Use qwery
  removing imagemin for now
  Hide popular galleries for childrens book site
  Fix Page Skins Bug
  Make the test token look fake to reduce confusion
  Set Stripe public key to LIVE

Conflicts:
	common/app/assets/javascripts/bootstraps/gallery.js
preload lightbox json on gallery pages