Merge branch 'use-uppercase-and-lowercase-codec-for-channels' into stage

Conflicts:
	src/main/java/org/atlasapi/output/simple/DescribedModelSimplifier.java
	src/main/java/org/atlasapi/output/simple/ItemModelSimplifier.java
	src/main/java/org/atlasapi/query/QueryWebModule.java
	src/test/java/org/atlasapi/output/FullToSimpleModelTranslatorTest.java
	src/test/java/org/atlasapi/output/simple/ItemModelSimplifierTest.java
	src/test/java/org/atlasapi/remotesite/FixedResponseHttpClient.java
	src/test/java/org/atlasapi/remotesite/channel4/C4HomepageClientTest.java