Brought asset has and artifact in-house

Simple copy n paste of the source code
SBT now starts with sbt version 0.12.2, scala 2.10.0 and play 2.1.0

Lots of stuff still commented out.
Common compiles now.

RequireJS plugin is disabled though
Article now compiles and serves an article.
Front now builds and renders
Everything except football now compiles
Football now compiles and serves pages
Tests now pass
given(), when() and then() are deprecated.

Replaced with Given(), When() and Then()
Merge branch 'master' of github.com:guardian/frontend into play-release

Conflicts:
	common/app/views/fragments/commonJavaScriptSetup.scala.html
	core-navigation/test/RelatedControllerTest.scala
	data/database/01c73cc69add1008eac0b52f160a3f6c3cffbae5
	data/database/095f30d071d7e433ee7951316764c2b2aa6d9944
	data/database/0bc92b59e7cbfb706d66f4684e4de501c5c2ab7d
	data/database/0ddc1a034a7f95c57dbda1b4f99c1ed0e2fb603b
	data/database/13f061314e6a002ed2b266ba61844a26b790e4e3
	data/database/15146ef302253f87b7b230e185889eb692174015
	data/database/16ed8c6031d68db147eba2c5d8d9251fc9586308
	data/database/1f5fe7c6246a502d2056e61e70d9a08eb2ee61e4
	data/database/203c90ef4e1226c442663238692818d58dcd3bb3
	data/database/229b6566d736a416504c09adbcbbfcfff4934533
	data/database/2b8b81306c1f1f32c8a5c985baa668a89d7ce01e
	data/database/3ae74c11e97ed92df2a2aef81de9442977fee1a0
	data/database/3e6e4ec90515f7f3b125d27bde5b8a444e020d04
	data/database/407821f7cd9aab0c0895afdd430e741f332bbadd
	data/database/481ba06cb4b30520a2969f060b04b0c8297bb6b0
	data/database/504a9cf6ab02ce10a5eedb89636916c41fed47c1
	data/database/520269fb1fc94652c24732ba0fe08d16364eab45
	data/database/521a3bbd8bfae57e6eeda5577aeacb02041bd710
	data/database/53430494a6cf57f950fc57db015724c73be38c01
	data/database/61cbafc88d7aaa5b5915f9b9ee2e677914aae8a7
	data/database/69c637c46a26ae71e8a3ceb3d44e6272a519ad73
	data/database/6c2584889742b6c571a1c3d84ce202209b9dd11c
	data/database/70441818ab79436dd9944b2c00be260c23a09263
	data/database/72e8d74d928a3b35b2b8f15607c03286130f1b14
	data/database/7ad1a03c78620c81a0d461a46a4be6e9c4559add
	data/database/7dea8338b1699a1db5896bf90b9b24b73064508e
	data/database/832ea02e99324bda9de6ba41e3f4bbe355148f17
	data/database/860050c28e6bca1aab205d1504ef80de986ffac0
	data/database/8c20c8d7f51b58b0dda00db50b777f4c47b7be9e
	data/database/8cb386f2f2ae61dfb886705d60d8d9608c4e0021
	data/database/96b8ebc2115a52ef3c144c2589f9e2510d1142b1
	data/database/96fedcadfd5efefc963f522c84c968c6abec1a25
	data/database/993b9d9edc07552b1a2fba07c50eb0bfbe2c98b5
	data/database/a6605622b308e690696b3499e6bd6e39709fb422
	data/database/ace52b658c50673fb733ecb2eb2505ecc9a39d87
	data/database/ae365b15b2fa4cefd2db31b93d69b975064e5a19
	data/database/b7907d430e55051df6d8a2827ad670937538a480
	data/database/ce2723eab5bfd55b68429885806765a9f700126d
	data/database/d01d1451d3c20b3f665357de1413c29d1e2628c9
	data/database/d1832e27c8d988c5c241cb48c6cbb12e95ffe12c
	data/database/d565f36de34680867f649ee8dbfa4931f5281959
	data/database/e28eada6782a9b18771d66bdc1aeb3432b10a5f2
	data/database/f1ca7965b76cf359295e43c53daf0b099f4acb21
	data/database/f21da9e562528a0f334a77e951e96e0c409e407d
	data/database/fd1d9c9c4eef04650c11bf5b14451f82d09cf6d7
	data/database/fe1c2e5435d637609a50f1db6aec4a4170d87d2c
	data/database/ff26a610c863eec4a1774632ff835d4600841a5f
	dev-build/app/Global.scala
	front/test/FrontFeatureTest.scala
	project/Frontend.scala
Setting up grunt directory structure
Working grunt tasks for require and jshint
Changed logger names
Fixed postfix warnings
Fixed higherKinds warnings
Fixed reflectiveCalls warnings
Fixed reflectiveCalls warnings
Merge branch 'master' of github.com:guardian/frontend into play-release

Conflicts:
	.gitignore
	common/app/common/ContentApiClient.scala
	data/database/e7adc1b2e2a479c26d481b47b9910ec0c0d108a4
	event/app/model/story.scala
Modified grunt plugin so it has a simple understanding of running only if files have changed
Merge branch 'master' of github.com:guardian/frontend into play-release