Merge branch 'master' of github.com:guardian/frontend into grid-containers-redux
Disjoint gs-container and js-context
Merge branch 'master' of github.com:guardian/frontend into grid-containers-redux
Merge branch 'redux-fronts-respect-grouping-news' into grid-containers-redux
Containers are at a component level instead of a global level
Merge branch 'master' of github.com:guardian/frontend into grid-containers-redux

Conflicts:
	common/app/views/fragments/containers/section.scala.html
	common/app/views/fragments/containers/special.scala.html
	common/app/views/fragments/containers/tag.scala.html
Monocolumn-wrapper and article-wrapper styling
Merge branch 'master' of github.com:guardian/frontend into grid-containers-redux

Conflicts:
	article/app/views/fragments/articleBody.scala.html
	article/app/views/fragments/liveBlogBody.scala.html
	common/app/views/fragments/containers/special.scala.html
	common/app/views/fragments/containers/tag.scala.html
Merge branch 'master' of github.com:guardian/frontend into grid-containers-redux

Conflicts:
	article/app/views/fragments/liveBlogBody.scala.html
Merge branch 'fronts-respect-grouping-news-take3' into grid-containers-redux

Conflicts:
	article/app/views/fragments/articleBody.scala.html
	article/app/views/fragments/liveBlogBody.scala.html
	common/app/views/fragments/relatedTrails.scala.html
Fix layout container nesting
Merge branch 'master' of github.com:guardian/frontend into grid-containers-redux
Fix classname
Add missing class and fix indentation
Remove unnecessary classname
Rename collection into facia-slice
Prevent anything from getting out of facia-container__inner
Merge branch 'fronts-respect-grouping-news-take3' of github.com:guardian/frontend into grid-containers-redux
Merge branch 'master' of github.com:guardian/frontend into grid-containers-redux

Conflicts:
	article/app/views/fragments/liveBlogBody.scala.html
	commercial/app/views/masterclasses.scala.html
	common/app/assets/stylesheets/module/commercial/_commercial-component.scss
	common/app/views/fragments/containers/special.scala.html
	common/app/views/fragments/containers/tag.scala.html
Merge branch 'master' of github.com:guardian/frontend into fronts-respect-grouping-news-take3