Integrate Foundation-Supported Pages

Conflicts:
	admin/app/controllers/CommercialController.scala
	admin/app/dfp/DfpDataCacheJob.scala
	admin/app/dfp/DfpDataExtractor.scala
	admin/app/tools/Store.scala
	admin/app/views/commercial/sponsorships.scala.html
	common/app/common/configuration.scala
	common/app/dfp/DfpAgent.scala
	common/app/dfp/DfpData.scala
	common/app/model/Section.scala
	common/app/model/meta.scala
	common/app/views/fragments/commercial/badge.scala.html
	common/test/common/GuardianConfigurationTest.scala
	common/test/dfp/DfpAgentTest.scala
	facia/app/model/FaciaPage.scala
Keep Sponsorship Version Numbers in Sync

Foundations-supported sponsorships have same version number
as the other types.
Rename nav-popup to popup
Style and behaviour for 'order by' pop up
correct width of mpu
Merge pull request #6190 from guardian/comtainer-mpu-tweak

Container MPU tweaks
Data link names
Lighter options displayer. No collection repaint if lastUpdated unchanged.
No need for html entity
Merge pull request #6192 from guardian/facia-tool-memory-leak

facia tool: fix memory leak
Merge pull request #6189 from guardian/popup-liveblog

Popup liveblog
Remove Magento Switch

Now that the Magento bookshop site is live
 and the old site has shutdown so we can't go back.
Merge branch 'master' into kc-foundation
fixing discussion regressions
Merge pull request #6191 from guardian/fc-rejig

rejig fc item css
Merge pull request #6197 from guardian/discussion-fix

fixing discussion regressions
Merge pull request #6148 from guardian/kc-foundation

Integrate Foundation-Supported Pages
Merge pull request #6196 from guardian/kc-magento-switch

Remove Magento Switch
Only show relevant options on closed articles
Merge pull request #6198 from guardian/facia-tool-display-options

facia tool: only show relevant options