type question modifié
Merge origin/master

Conflicts:
	classes/Mapper/TypeQuestionMapper.php
	enquete.php
Merge origin/master

Conflicts:
	classes/Mapper/UtilisateurMapper.php