Merge pull request #1 from thatcoderguy/master

Merge changes
Finished category ordering + removed some redundant code + started edit category
Merge pull request #2 from widagroup/master

Finished category ordering + removed some redundant code + started edit category