Rest-doc modifications, CollectionServiceTest
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop

Conflicts:
	src/main/java/de/mpg/imeji/rest/resources/ItemResource.java