Merge pull request #22 from widagroup/master

Fixed issue with registration + added new permission for creating categories and passwords
Started removing references to base64 from the encryption methods
Merge pull request #20 from thatcoderguy/master

merge changes