Bearbeitung User.java
Merge remote-tracking branch 'origin/master'