Add fields and getters/setters in User.class
Merge branch 'UserImplementation' into ModelImplementation