test pour conflit suite
Merge branch 'master' of https://github.com/Broutard/rapidexos

Conflicts:
	www/application/web/intFormateur/controllers/ArnaudController.php