Expired content fits into monocolumn container
Merge pull request #1072 from guardian/dotcom

InBodyLink now understands editions
Merge branch 'master' of github.com:guardian/frontend into expired-content-layout

Conflicts:
	common/app/views/fragments/expiredBody.scala.html
Merge pull request #1052 from gidsg/change-article-with-expander

Change article with expander
Merge branch 'master' of github.com:guardian/frontend into share-email
Bump sbt-assembly to 0.9.0 for caching features.
Added the pom.xml for admin

Used by the admin integration tests.
Blocks wrap around floated elements and h2s do not cause a content break
Use environment to configure app.

Updated application.conf files to receive application parameter from environment.
Pass input into java process to automate TC runs, and remove log formatting.
Added listening socket to java process for attach-and-debug.
Merge pull request #1077 from guardian/sbt-assembly-upgrade

Bump sbt-assembly to 0.9.0 for caching features.
Moved localnav styles to separate stylesheet
Make the sbt debugger opt-in.
Don't enable second nav when Swipe is enabled
Fix specificity issues on the CTA
Merge branch 'master' into local-nav
Update Readme about debugging.
Users can share an article via email
Change the keys to alphanumeric.
Merge pull request #1078 from guardian/parameterise-config

Use environment to configure app.
Update pom.xml

update selenium version to LATEST