Signed-off-by: yowik <yohanaparodi@gmal.com>
Merge branch 'master' of https://github.com/yowik/gestion

Conflicts:
	application/static/js/script_gestion.js
Signed-off-by: yowik <yohanaparodi@gmal.com>