Merge branch 'master' into mbst-4910-ingest-multiple-pa-images
Merge branch 'master' into mbst-4910-ingest-multiple-pa-images

Conflicts:
	src/test/java/org/atlasapi/remotesite/FixedResponseHttpClient.java
Merge pull request #243 from atlasapi/mbst-4910-ingest-multiple-pa-images

Use multiple images for pa ingest
Merge pull request #258 from atlasapi/mbst-4764-add-series-to-sub-items

Populate series list in simple model if SERIES annotation is present
Schedule Lovefilm equivalence task to run every 12 hrs, 2 hrs after the Lovefilm ingest task.
Merge branch 'mbst-5237-schedule-lovefilm-equiv' into stage

Conflicts:
	src/test/java/org/atlasapi/remotesite/FixedResponseHttpClient.java