Initial version of Channels ingest task, with some initial tests
Tidied up Channels and ChannelGroups. References to channels/channelGroups are now Longs (i.e. the object's id field).
Updated usages of channels and channelgroups to work with changes.
Extensive output changes, including a rewrite of the ChannelGroupController, to add several new annotations and filters.
Also added integration tests for Channels ingest, along with various tweaks and bug fixes.
Merge branch 'mbst-4019-ingest-pa-channel-data' into stage

Conflicts:
	pom.xml
	src/main/java/org/atlasapi/ChannelAvailableOnSettingTask.java
	src/main/java/org/atlasapi/ChannelGroupIngestTask.java
	src/main/java/org/atlasapi/MongoChannelInitialPopulate.java
	src/main/java/org/atlasapi/query/QueryWebModule.java
	src/main/java/org/atlasapi/query/v2/ChannelController.java
	src/main/java/org/atlasapi/query/v2/ChannelGroupController.java
	src/main/java/org/atlasapi/query/v2/ChannelSimplifier.java
	src/main/java/org/atlasapi/remotesite/pa/PaModule.java
	src/main/java/org/atlasapi/remotesite/pa/data/DefaultPaProgrammeDataStore.java
	src/main/java/org/atlasapi/remotesite/pa/data/PaProgrammeDataStore.java
Merge branch 'stage' of github.com:atlasapi/atlas into stage