Refactor createOrUpdate method in MongoChannelStore to extract methods and make code more readable
Merge pull request #58 from atlasapi/mbst-4019-ingest-pa-channel-data

Ingest Channels from PA
Merge pull request #59 from atlasapi/mbst-3790-prototype-images-node

initial images work
Merge branch 'master' into mbst-4008-atlas-aliases

Conflicts:
	src/main/java/org/atlasapi/media/channel/MongoChannelStore.java
	src/test/java/org/atlasapi/media/channel/MongoChannelStoreRetrievalTest.java
Merge pull request #60 from atlasapi/mbst-4008-atlas-aliases

atlas aliases
Change to alias URLs
Merge branch 'master' into stage

Conflicts:
	src/main/java/org/atlasapi/persistence/media/channel/MongoChannelGroupStore.java
	src/main/java/org/atlasapi/persistence/media/channel/MongoChannelStore.java
	src/test/java/org/atlasapi/persistence/media/channel/MongoChannelStoreRetrievalTest.java
	src/test/java/org/atlasapi/persistence/media/channel/MongoChannelStoreWriteTest.java