Merge pull request #301 from atlasapi/image-type-field

Update simplification with changes to simple Image type field
Merge pull request #302 from atlasapi/segment-fields

Update simplification for simple Segment field changes
Change method for generating Java from xml schema files, so that only one generated-sources folder
needs to be added to the build path. Unfortunately, it doesn't seem to add the generated-sources folder
to the build path automatically.
update pa channel schema files.
Add full images to channels.
 - refactor image simplification code out into separate image simplifier.
 - rework channel simplification to populate new images field on both channels and channel history
elements.
Add forceUpdate element to jaxb2 executions, to ensure that files are regenerated, as
stale flag seems to be ineffective. also remove duplicate maven-compiler-plugin element.
Improve error messages for 404 and 400 on channel(group)s endpoints
Only create history entries for images / titles with non-null start dates.
Move cassandra properties out to environment properties files, to make cassandra more configurable.
Ensure ImageTheme defaults sensibly on channels ingest.
Update stage cassandra keyspace to be Atlas_Stage
Update channels test to work with new images.
Merge pull request #284 from atlasapi/mbst-5686-ingest-pa-channel-logos

Mbst 5686 ingest pa channel logos
Move bt test resources to src/test/resources from src/test/java
Add hd, regional and timeshift fields to channel summary on items, when channel_summary annotation
is present.
Merge branch 'mbst-6444-add-fields-to-channel-summary' into stage

Conflicts:
	src/main/java/org/atlasapi/output/simple/ChannelSimplifier.java
	src/main/java/org/atlasapi/output/simple/DescribedModelSimplifier.java
	src/main/java/org/atlasapi/output/simple/ImageSimplifier.java
	src/main/java/org/atlasapi/output/simple/ItemModelSimplifier.java
	src/main/java/org/atlasapi/remotesite/channel4/epg/C4EpgBrandlessEntryProcessor.java
	src/main/java/org/atlasapi/remotesite/channel4/epg/C4EpgEntryProcessor.java
	src/main/resources/config/environment.properties
	src/test/java/org/atlasapi/output/simple/ItemModelSimplifierTest.java
	src/test/java/org/atlasapi/remotesite/pa/channels/ChannelHierarchyTest.java
Correct merge of channels destroying changes to the id codecs