Update .gitignore
Merge branch 'master' into develop
update project
modified .gitignore
update
update IUser, remove username, add email and phone