New feature files, work in progress. Committing so I can work on this code on another machine.
Merge branch 'master' of github.com:guardian/frontend into grid-containers-redux
Disjoint gs-container and js-context
Working from home

Committing unfinished to branch so I can continue to work on this. The
tracking test are still failing. Need to figure out why.
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
Introduce competition stages for multi-stage comps (World Cup)

Stages are one of:

League
Groups
Knockout

Each of these will be displayed differently - full league table, group
tables or multi-round tournament knockout spider.
Add and test extra data on CompetitionStage classes

Now contains the data needed to render stages on the frontend.
Worldcup wallchart with test data
Merge remote-tracking branch 'origin/football-groups' into competition-stages-wallchart
Combine backend and frontend work

Now have real data driving the world cup wallchart.
Add detail to the wallchart implementation

Matches are now displayed more completely - incldues score for live
matches / results, as well as match comments.

Also supports league stages
Remove old template file
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