Merge pull request #83 from dr40/ok/74/Manage_Category

Ok/74/manage category
Merge pull request #84 from dr40/dev

Merge pull request #83 from dr40/ok/74/Manage_Category