début de formulaire de modification d'un utilisateur
Merge branch 'master' of https://github.com/haflinger/comulien

Conflicts:
	application/configs/acl.ini
	application/data/log/application.log
	application/forms/EcrireMessage.php
Merge branch 'master' of https://github.com/haflinger/comulien
en cours...
Merge branch 'master' of https://github.com/haflinger/comulien

Conflicts:
	application/forms/EcrireMessage.php