commit by marwen
Merge marwensdiri/master
Merge marwensdiri/master
Merge marwensdiri/master
Merge marwensdiri/master
Merge marwensdiri/master
Merge marwensdiri/master
Merge marwensdiri/master

Conflicts:
	dao/utilisateur_dao.php
	entity/UtilisateurEntity.php
	parsing/reclamation_xmlparser.php