Merge pull request #212 from atlasapi/mbst-9187-channel-numbering-date-ranges

Add start and end dates to the simple model ChannelNumbering
Add complex model for audience stats and demographics
Merge pull request #213 from atlasapi/mbst-9152-audience-data

Add complex model for audience stats and demographics
Allow unit testing on audience
Merge pull request #214 from atlasapi/audience-unit-testing

Allow unit testing on audience
Specify source encoding in POM
Merge genres on output
Merge pull request #215 from atlasapi/merge-genres

Merge genres on output
Revert "Merge genres on output"

This reverts commit 90e134074f8e81d1cce2e497387492e19faf014b.
Merge branch 'master' into stage

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