changes made in edit function
category model updated
slight changes made
Merge remote-tracking branch 'origin/master'