modified Server.java and User.java
Merge branch 'dev' of https://github.com/plumer/diki into dev

denny changed something