Merge pull request #67 from ShadowSam/master

Fixes to get these changes back to perfect up and running state. Now this branch is ready to be merge with dev and master in a controlled fashion with the changes to the main database.
Merge pull request #68 from ShadowSam/master

Deleting entity completely working
Merge pull request #69 from Venture-TheSphinxTeam/subscriptions

Subscriptions