WIP simple sponsored content
Merge branch 'master' of https://github.com/guardian/frontend into article-sponsorship
Merge branch 'master' into article-sponsorship
Unit test for sponsored content
Use default Java.

R2 overrides to 1.6, we don't want that.
Explicitly use Java 1.7.

R2 overrides to 1.6, we don't want that.
Explicitly use Java 1.7.

R2 overrides to 1.6, we don't want that.
Oops, not good bash that
Split out results from querying collections into curated, editorsPicks and results
Merge branch 'master' of https://github.com/guardian/frontend into article-sponsorship

Conflicts:
	common/app/model/content.scala
Add Cache for endpoint which redirects
Add Carphone Warehouse campaign
Fix typo in SBT
Fix typo in SBT TC
Tidy up sponsored articles ready for PROD

- Added SASS (based on article-zone).
- Scala checks the 'paid content' message appears when the sponsored tone is present.
- Switch to turn the feature off/on.
Loader now supports the mobile test
Merge pull request #2664 from guardian/tc-jvm-settings

Tc jvm settings
comment style tweaks to action links and margins
fixing transition delay mixin
using box-sizing mixin