Merge pull request #96 from widagroup/master

Merge pull request #36 from thatcoderguy/master
Merge pull request #98 from widagroup/master

More bug fixes to the encryption
Added jquery cookie + started to implement opencategory functions
Merge pull request #37 from thatcoderguy/master

merge changes