Pull request for issues #52 and #53

This incorporates all additions and changes to Projects and Users to address issues #52 and #53