Base REST and database functionality to manipulate user data.
Merge remote-tracking branch 'origin/master' into NIGEL_BRANCH