UserBean merged
Merge branch 'master' of https://github.com/teamwahnsinn/teamwahnsinn.git
merge