Change getBelongedProjects method to return the role of the user, add method to get roles of users in a project
Modify getAllProjects() to return a dummy Role attribute
Fix conflict with upstream
Change getBelongedProjects method to return the role of the user, add method to get roles of users in a project
Modify getAllProjects() to return a dummy Role attribute
Fixed conflicts
Modify getUserData() to return moderator and administrator status
Add method updateUser to userManager with functions of updating email and gravatar email
Modify userdata to return also password hash, add method to confirm password correctness, add password action to updateUser method
remove useless comment
Fix syntax error
Make getSession() return all of user's properties
Delete useless hashings for confirmPassword()
Change getBelongedProjects method to return the role of the user, add method to get roles of users in a project
Modify getAllProjects() to return a dummy Role attribute
Resolve conflict
Modify getAllProjects() to return a dummy Role attribute
Modify getUserData() to return moderator and administrator status
Add method updateUser to userManager with functions of updating email and gravatar email
Modify userdata to return also password hash, add method to confirm password correctness, add password action to updateUser method