change user/entity/User.java
Merge branch 'master' of https://github.com/ReturnOnIntellingenceTraineeCommunity/rtc-user-webservices