Commit to pull
fix conflict
Fix test erro and add create item tests
Fix all test error
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop

Conflicts:

	src/test/java/de/mpg/imeji/rest/resources/test/integration/CollectionTest.java