Merge pull request #2 from thatcoderguy/master

Merge changes.
Edit category almost finished - just need to add the "hide form code
Merge pull request #3 from widagroup/master

Added edit category functionality - some minor updates required