ajout de fonction dans la classe userMAnager()
Client et usermanager et connexion
Merge remote-tracking branch 'bettyfava/master'
Merge remote-tracking branch 'jo/master'

Conflicts:
	class/UserManager.php
Merge remote-tracking branch 'BettyFava/master'
Merge remote-tracking branch 'Ludovic/master'