fix for: https://github.com/imeji-community/imeji/issues/915
part of: https://github.com/imeji-community/imeji/issues/879
test commit
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop

Conflicts:
	src/main/java/de/mpg/imeji/presentation/upload/UploadBean.java
	src/main/java/de/mpg/imeji/presentation/upload/UploadSession.java