Added inline videos to content api call
Fixed typo
Merge branch 'master' of github.com:guardian/frontend into inline-videos

Conflicts:
	article/app/controllers/ArticleController.scala
	common/app/assets/stylesheets/module/_article.less
Accessibility additions: aria roles and managing focus
Added main role to fronts
Merged master and fixed sections conflict
Added navigation roles and labels to secondary content
testing show more cta
1.1.x version of cucumber, and junit 4 style assertions
Started switching to Async football client
updating docs
xerces for htmlUnit
Fixed merge conflict
Removed navigation role from most popular
almost all test now work
Fixed merge conflicts
Added omniture video tracking
Merge branch 'master' of https://github.com/guardian/frontend
Working omniture video tracking
Fixed merge conflicts