Refactoring discussion routes to allow for more dynamic JSON calls
Structured comments take 1
Merge branch 'master' of github.com:guardian/frontend into structured-comments
refactor directory layout for commercial
remove erroneous newlines
Merge pull request #4950 from guardian/discussion-routes-tidy

Refactoring discussion routes to allow for more dynamic JSON calls
fixing video initialisation
Merge branch 'master' of github.com:guardian/frontend into structured-comments

Conflicts:
	discussion/app/controllers/CommentsController.scala
	discussion/app/discussion/DiscussionApi.scala
Merge pull request #4980 from guardian/video-fix

fixing video initialisation
Merge pull request #4979 from guardian/commercial-js-structure-refactor

Refactor directory layout of commercial JS
Goodbye, Java! It's been good. I'll miss you.

Scala, here I come!
Merge pull request #4964 from guardian/structured-comments

Structured comments take 1
Grunt default order change
Hydrating All Current DFP Line Items
Compile images with CSS to valisdate
move high relevance between 2 and 3; don't show if less than 2 containers
Merge pull request #4920 from guardian/high-relevance-position

Moving high relevance commercial component between 2nd and 3rd container
Merge pull request #4983 from guardian/remove-java

Removing webdriver project.
Merge pull request #4985 from guardian/dfp-hydration

Build DFP Data Hydrator
Add sponsor method to MetaData