Fixed bugs associated with User class
Merge remote-tracking branch 'upstream/subscriptions'
Merge pull request #64 from ShadowSam/master

Still untested but now compiling... necessary for teamwork. Do not pull unless working with subscription database infastructure change