Merge pull request #65 from Digikid13/master

Admin part of API
changes to user and admin functions