Flatten the user entity. Fix Create/Modify user methods.
Merge pull request #3 from ZombiePro/task/fix_modify_user_method

Flatten the user entity. Fix Create/Modify user methods.
fix merge conflicts