commit divers
Merge branch 'master' of https://github.com/alexsolex/hackTERPoulpeTeam

Conflicts:
	application/controllers/TestController.php
Merge branch 'master' of https://github.com/alexsolex/hackTERPoulpeTeam
question
Merge branch 'master' of https://github.com/alexsolex/hackTERPoulpeTeam
gare test