Separate client side build from SBT.
Clean .gitignore.
Merge branch 'master' into frontend-build

Conflicts:
	Gruntfile.js
Git hook was doing too much after Gruntfile refactor.
Merge branch 'master' into frontend-build

Conflicts:
	common/app/assets/AssetsPlugin.scala
	common/app/assets/images/global/sprite.png
	common/app/common/StaticAssets.scala
	common/app/conf/application.scala
	identity/conf/play.plugins
Merge branch 'master' into frontend-build

Conflicts:
	applications/conf/routes
	dev-build/conf/routes
	facia-dev-build/conf/routes
Refactor and BEMify match summary
Replace concierge objects with trait inheritance
Add cartoon content type to applications
Reduce fonts-ze of tabs at lower breaks
Optimizing guardian retina logo while we're at it even if we don't use it anymore
Remove unused image-white icon
Changed style of football nav heading
Add space
Remove uncessecary span
Merge pull request #1912 from guardian/football-styling

Styling tweaks to football match pages
Merge pull request #1897 from guardian/frontend-build

Separate client side build from SBT.
Include single-picture and graphic type content
SBT_EXTRA_PARAMS unused. Caught by nounset in parent script.
Move lookup out of image content controller