Merge origin/master

Conflicts:
	dao/utilisateur_dao.php
Merge origin/master

Conflicts:
	dao/utilisateur_dao.php
Merge origin/master