Merge branch 'master' into remove-identity
Sport tests run on port 9013
even crisper logo, small, thanks to @paperboyo
layout header ot new dimensions
Remove js escaping switch: we've proved the changes work.
remove 'beta' from the logo
Run tests in parallel
added some more enhancments and logs due to flakiness

Conflicts:
	integration-tests/scala-fw-tests/src/main/scala/com/gu/integration/test/util/ElementLoader.scala
Add low and high dpi helper classes
Merge branch 'preview-oauth'

Conflicts:
	common/conf/env/DEV.properties
	common/test/common/GuardianConfigurationTest.scala
Simplify home icon management
Simplify the test port
Merge branch 'master' into parallel-tests

Conflicts:
	preview/app/conf/context.scala
no bottom margin on last items
Merge pull request #5309 from guardian/century-redirects

Add century content redirects
added test retries for some flaky tests
add GraphicsMagick
Not in PROD was only in DEV
minor cleanup of import
Merge remote-tracking branch 'origin/master'