Changes to simulate a 7 day availability window:
 - new content resolver, only permits content as 'available' if the interval startdate-(startdate + 7 days) is current.
 - output start date + 7 days as the availability end on ondemands
Merge branch 'add-retry-logic' into stage

Conflicts:
	src/test/java/org/atlasapi/feeds/youview/nitro/NitroOnDemandLocationGeneratorTest.java