some changes made in category model
Merge remote-tracking branch 'origin/group2' into group2