Merge pull request #169 from atlasapi/mbst-7559-ingest-pa-adult-genre

Add Adult flag to complex/simple Channel
Merge pull request #167 from atlasapi/mbst-7547-equiv-single-item

Change EquivalentContentResolver interface to take app config not srcs
Add a new publisher: Wikipedia
Merge pull request #171 from atlasapi/mbst-7657-wikipedia

Add a new publisher: Wikipedia
Use gson to serialize EquivalenceSummaries rather than Jackson
Merge pull request #173 from atlasapi/gson-equiv-summary

Use gson to serialize EquivalenceSummaries rather than Jackson
Add missing pubishers from deer
Merge pull request #174 from atlasapi/add-missing-publishers-from-deer

Add missing pubishers from deer
Don't merge certificates on equivalent films

Instead, the certificates on the most precident content with certificates
will be output
Merge branch 'film-merge-certs' into stage

Conflicts:
	src/main/java/org/atlasapi/media/entity/Publisher.java