updating category display
Merge remote-tracking branch 'origin/Roberto' into Alessandro
finsih category and subcat
Merge branch 'master' into Ouch
resolve
Merge branch 'Ouch' of https://github.com/ThomasAy/Projet1 into Ouch
Final
Merge branch 'Ouch'