fix for schedule merging
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
Add 'strict' mode to equivalence Episode filtering

Configure Episode equivalence filtering with a strict mode flag. In
strict mode an Item's candidate equivalent's Container must be
equivalent to the Item's Container. That is, for a candiate equivalent,
E, of item, I, E's Container, Ec, must be equivalent to I's Container,
Ic. In relaxed mode, Ec need not be equivalent to Ic but there must be
no other equivalent container for that source.

Currently all filters are in relaxed mode
Add ContentEquivalenceUpdater.Builder, refactor EquivModule to use it
Rename ItemScoreFilteringCombiner, refactor ScoreThreshold
VOD Equivalence Item require Title Score
add MediaType filter
Rename Scorers that end EquivalenceScorer
Remove RequiredScoreFilteringCombiner from standard Item updater

The RequiredScoreFilteringCombiner in the standard Item Equivalence
updater referred to a generator that was only used for Container
equivalence.
Merge branch 'mbst-4081-strict-parent-episode-filter' into stage

* mbst-4081-strict-parent-episode-filter:
  Remove RequiredScoreFilteringCombiner from standard Item updater
  Rename Scorers that end EquivalenceScorer
  add MediaType filter
  VOD Equivalence Item require Title Score
  Rename ItemScoreFilteringCombiner, refactor ScoreThreshold
  Add ContentEquivalenceUpdater.Builder, refactor EquivModule to use it
  Add 'strict' mode to equivalence Episode filtering
  Temp sanity check to catch titles of content being null
  fix for schedule merging

Conflicts:
	src/main/java/org/atlasapi/equiv/EquivModule.java
	src/main/java/org/atlasapi/equiv/update/ContentEquivalenceUpdater.java