Merge branch 'enhance-equiv-result' into stage

* enhance-equiv-result:
  colour strong equivalence results
  Add minimum edges to equivalence graph

Conflicts:
	src/main/java/org/atlasapi/equiv/results/www/EquivGraphController.java
Output an equivalents block rather than sameAsIds
Merge branch 'mbst-5963-person-ids' into stage

* mbst-5963-person-ids:
  resolve Persons by id via the PeopleController
  Call on ctor from t'other
  Topics should also use the lowercase only codec

Conflicts:
	src/main/java/org/atlasapi/query/v2/TopicController.java
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.
Merge branch 'mbst-5686-ingest-pa-channel-logos' into stage

Conflicts:
	src/main/java/org/atlasapi/output/simple/ContentModelSimplifier.java
	src/main/java/org/atlasapi/output/simple/DescribedModelSimplifier.java
	src/main/java/org/atlasapi/output/simple/PersonModelSimplifier.java
	src/main/java/org/atlasapi/remotesite/channel4/epg/C4EpgBrandlessEntryProcessor.java
	src/main/java/org/atlasapi/remotesite/channel4/epg/C4EpgEntryProcessor.java
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.
Merge branch 'mbst-5686-ingest-pa-channel-logos' into stage
Use lowercase codec for simple model topic IDs
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
PersonResolver.person should return a Maybe<Person> rather than Person which may be null
Update people controller to use PeopleQueryResolver
MongoContentResolver now needs a LookupEntryStore as a collaborator
so that IDs can be injected into resolved content.
MongoContentStore now needs a MongoLookupEntryStore in tests
Add MongoLookupStore to MongoContentResolver
add task to update Person/Content refs
Add SeriesSequenceItemScorer for Lovefilm Item equivalence

The SeriesSequenceItemScorer is an additional Equivalence scorer for
Lovefilm Items which downweighs Episodes from different Series.
Move FixedResponseHttpClient to common

Conflicts:
	src/test/java/org/atlasapi/remotesite/FixedResponseHttpClient.java
	src/test/java/org/atlasapi/remotesite/channel4/C4HomepageClientTest.java
Merge branch 'mbst-5935-series-equiv-score' into stage

* mbst-5935-series-equiv-score:
  Add SeriesSequenceItemScorer for Lovefilm Item equivalence
  Set lookup aid in ChildRefUpdateTaskTest
  Add MongoLookupStore to MongoContentResolver
  MongoContentStore now needs a MongoLookupEntryStore in tests
  MongoContentResolver now needs a LookupEntryStore as a collaborator so that IDs can be injected into resolved content.
  Use lowercase codec for content refs on content groups
  Channels embedded in items should use upper- and lowercase codec
  Use lowercase codec for simple model topic IDs
  Output an equivalents block rather than sameAsIds
  Add sameAsIds to simple model
  Add POST handling for /topics.json resource
  Set ID on parent refs
  Move FixedResponseHttpClient to common
  add JSON content PUT resource

Conflicts:
	src/main/java/org/atlasapi/output/simple/ContentGroupModelSimplifier.java
	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/channel4/C4HomepageClientTest.java