Add wait for related content transclusion and increase wait timeout
Removed switch for item redirects
Fixed what happens when a Short URL ends up on the wrong server
Kill the back to article button as per Nick Haley's recommendation
Article head spans properly on phablets
Merge branch 'master' of github.com:guardian/frontend into article-layout-fixes
Local Nav fixes
Whitespace
Image content uses the latest discussion template
Main caption fits in the copy columning on tablet
Confirm Omniture pageview beacon
Wait for Omniture pageview event before firing ad impression events
Better description
Adding Postscribe lib
Replace domwrite with postscribe
Remove domwrite files
Merge branch 'master' of github.com:guardian/frontend into item-redirects

Conflicts:
	dev-build/app/Global.scala
Put the npm & grunt bits back in the ./sbt file

We keep getting caught out by this.
Merge pull request #2190 from guardian/sbt-script

Put the npm & grunt bits back in the ./sbt file
Adding comment on the magic s_i_guardian variable