Merge pull request #145 from SartoriusEarth/develop

Added consent, withdraw consent, and email copy of consent to backend through Eric's DAO classes, and added this to the front end settings page.
Switching from path params to query parameters.
Adding import
added locking mechanism for editing user information. Before deleting any records, we make sure that only one person is accessing the records.
Merge pull request #148 from alxdarksage/develop

Switching from path params to query parameters.
Merge pull request #147 from SartoriusEarth/develop

Added "removeAllHealthDataRecords" method to the UserAdminService. This is not complete but we need to check it in to fix the service interfaces so none of the services refer to our session store.
Fixed broken tests, completed lock feature. The only place which uses it is currently the delete user feature. However, it could be used in many places, but I am not sure where.
Merge branch 'locking' into develop

Completed locking feature, merging to develop so that I can submit a pull request.
Merge remote-tracking branch 'upstream/develop' into develop

Merging what's upstream to submit pull request.