First version of youview ingest
plus/minus params on scheduled tasks are now in right order, dates are now formatted correctly in the youview url
Removed static channel map, as appropriate channel aliases and availableOn values added to channels by included js script.
Initial attempt at youview equivalence job
Initial version of broadcast merging
Testing for broadcast merging
Add aliases to existing aliases when broadcast merging, rather than replacing the existing set
Ingest all services from youview, not just channel 5.
Also, pass through aliases on Broadcasts to the simple model.
Add new method to DummyYouViewChannelResolver
ProgrammeCRID is optional, so don't throw an exception if it isn't there
adjust youview ingest so programme ids are stored as uris
Merge branch 'master' into mbst-3880-youview-ingest

Conflicts:
	src/main/java/org/atlasapi/equiv/EquivModule.java
	src/main/java/org/atlasapi/equiv/query/MergeOnOutputQueryExecutor.java
	src/main/java/org/atlasapi/output/simple/ItemModelSimplifier.java
	src/main/java/org/atlasapi/remotesite/youview/DefaultYouViewChannelResolver.java
	src/main/java/org/atlasapi/remotesite/youview/YouViewChannelResolver.java
	src/main/java/org/atlasapi/remotesite/youview/YouViewContentExtractor.java
	src/main/java/org/atlasapi/remotesite/youview/YouViewFortnightUpdater.java
	src/main/java/org/atlasapi/remotesite/youview/YouViewModule.java
	src/main/java/org/atlasapi/remotesite/youview/YouViewScheduleFetcher.java
	src/main/java/org/atlasapi/remotesite/youview/YouViewTodayUpdater.java
	src/main/java/org/atlasapi/remotesite/youview/YouViewUpdater.java
	src/test/java/org/atlasapi/remotesite/youview/DummyYouViewChannelResolver.java
	src/test/java/org/atlasapi/remotesite/youview/YouViewItemParseTest.java
Merge pull request #224 from atlasapi/mbst-3880-youview-ingest

youview ingest