Commit à cause d'un problème de pull...
Merge branch 'master' of https://github.com/chougron/LOG210

Conflicts:
	app/model/User.php
Merge branch 'master' of https://github.com/chougron/LOG210
Résolution de certains problème de User.
Merge branch 'master' of https://github.com/chougron/LOG210