Modified routes and added admin functionality. Requesting /user with an admin's token now gives full user list
Merge branch 'master' into develop
Updated package.json