Update categorie
Merge remote-tracking branch 'origin/charles'