Add new channels STV+1, Drama, True Drama and BBC Red Button channels
Merge pull request #118 from atlasapi/mbst-5575-channel-config-from-atlas

Channel configuration support
Add people equivalence storage and resolution
Merge childrefs when merging content groups
merge Person fields on output
Merge branch 'mbst-4778-people-equivalence' into stage

* mbst-4778-people-equivalence:
  merge Person fields on output
  Merge childrefs when merging content groups
  Add people equivalence storage and resolution
  Add new channels STV+1, Drama, True Drama and BBC Red Button channels

Conflicts:
	src/main/java/org/atlasapi/equiv/OutputContentMerger.java