Merge branch 'develop' of https://github.com/imeji-community/imeji into develop

Conflicts:
	src/main/java/de/mpg/imeji/rest/process/ItemProcess.java
	src/test/java/de/mpg/imeji/rest/resources/test/integration/ItemTest.java
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop