Allow null years for FilmEquivalenceGenerator
Merge branch 'top-level-item-vod-equivalence' into stage

Conflicts:
	src/main/java/org/atlasapi/equiv/generators/FilmEquivalenceGenerator.java