add merge parameter to schedule resolver
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
move output merging to atlas-model
add ApplicationConfiguration parameter to ScheduleResolver
fix for schedule merging
Set 3d flag, along with certificate and duration, when item is updated, not just when creating an item
Merge pull request #211 from atlasapi/fix-3d-flag-not-set

3d flag now set when updating an item
Temp sanity check to catch titles of content being null
Merge pull request #213 from atlasapi/mbst-3928-schedule-merge

MBST-3928 schedule merge
Merge branch 'master' into mbst-3744-netflix-ingest

Conflicts:
	src/main/java/org/atlasapi/remotesite/netflix/NetflixContentExtractor.java