Merge aufgrund von Konfliktbeseitigung
Merge branch 'master' of https://github.com/britzke/shareezy.git

Conflicts:
	src/main/java/org/shareezy/beans/RegestrierungsBean.java
Merge branch 'master' of https://github.com/britzke/shareezy.git