a
Merge branch 'master' of https://github.com/yowik/gestion/

Conflicts:
	application/libraries/Gestion.php