https://github.com/imeji-community/imeji/issues/816

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

Conflicts:
	src/main/java/de/mpg/imeji/logic/vo/User.java
	src/main/java/de/mpg/imeji/presentation/user/UserBean.java