Prototype images - some hardcoding for now
Modify simplification code to simplify re-worked image block, and cope with images annotation
Catch case where Described.getPrimaryImage() returns null
If no image string on the content in question, create primary image with default constructor
Merge branch 'master' into mbst-3790-prototype-images-node

Conflicts:
	src/main/java/org/atlasapi/equiv/query/MergeOnOutputQueryExecutor.java
Merge pull request #222 from atlasapi/mbst-3790-prototype-images-node

initial images work