changed coment in User.java
Merge branch 'master' of ssh://github.com/SEPM/SEPM