InBodyLink now understands editions
Merge branch 'master' of github.com:guardian/frontend into dotcom
Renamed InBodyLink to LinkTo
Merge pull request #1072 from guardian/dotcom

InBodyLink now understands editions
Merge branch 'master' of github.com:guardian/frontend into expired-content-layout

Conflicts:
	common/app/views/fragments/expiredBody.scala.html