even clusters which have pictures already are getting filled up with up to 4 pictures
Merge remote-tracking branch 'origin/master'

Conflicts:
	GAE-SEEKRET-Backend/Seekret/src/com/seekret/businesslogic/impl/SpotCalculationHandler.java
	GAE-SEEKRET-Backend/Seekret/war/WEB-INF/spotAPI-v1.api