Merge pull request #319 from atlasapi/image-attributes

Add DescribedImageExtractor to get Images on Described simplification
Support UPCOMING and AVAILABLE_LOCATIONS on people
Merge branch 'people-upcoming' into stage

* people-upcoming:
  Support UPCOMING and AVAILABLE_LOCATIONS on people

Conflicts:
	src/test/java/org/atlasapi/output/simple/ItemModelSimplifierTest.java