Merge pull request #222 from atlasapi/mbst-3790-prototype-images-node

initial images work
Revert "Merge pull request #222 from atlasapi/mbst-3790-prototype-images-node"

This reverts commit 74b5eca0f00cea938e6b54dd2ed104b28ebf8ed1, reversing
changes made to 4198d833b35405343fe7cf5dc07b1d06aab644d2.
Revert "Merge branch 'master' into mbst-3790-prototype-images-node"

This reverts commit 93a961395e4d7edd8d95d2273e4a1f83041f36ee, reversing
changes made to cbdd1f1d8d80fd3df314ec752ac307be49ef37ff.
Merge branch 'master' into mbst-3790-prototype-images-node

Conflicts:
	src/main/java/org/atlasapi/equiv/query/MergeOnOutputQueryExecutor.java