Merge branch 'master' into Alessandro
Adding sub_category
Merge remote-tracking branch 'origin/Alessandro' into Roberto
CategoryPictureIssue