update user

Signed-off-by: roukaya <rakrouk@hotmail.fr>
Merge remote-tracking branch 'origin/master'

Conflicts:
	tn.edu.espritCS.eRambling/src/tn/edu/espritCS/eRambling/services/UserDao.java
	tn.edu.espritCS.eRambling/src/tn/edu/espritCS/eRambling/tests/TestManageUser.java