Merge remote-tracking branch 'upstream/develop' into data_sharing
Modified consent service so that data sharing is implemented. It was already implemented on the DAO level, just not run through the service.
withdrawConsent did not return user, so we did not save this information to the session. Corrected this bug.
Compile html templates.
Merge remote-tracking branch 'base/develop' into develop
Merge remote-tracking branch 'base/develop' into develop
Discard.
Added consent controller test. Updated consent controller to start data sharing by default when giving consent (this seems like desired behavior). Updated front end such that a user can now suspend and resume data sharing (as soon as a default study consent is added by Eric. Right now it doesnt actually work. But it does in theory).
Merge remote-tracking branch 'upstream/develop' into data_sharing
Added type property to all the models. The type property is the just the class name of the model (e.g. Study.javas type is "Study")
Add logging to consent backfill.
Merge pull request #160 from SartoriusEarth/develop

Added StudyConsentController
added date model.
Merge pull request #174 from SartoriusEarth/develop

Fixed failing test from last pull.
Merge pull request #173 from eric-wu/develop

Add logging to consent backfill.
made some changes to dates. Created a date model, which accepts a timestamp and then reorganizes it into various shapes.
Add more logging.
Merge pull request #175 from eric-wu/develop

Add more logging.
Per study backfill.
Made changes to implement the ISO 8601 standard. Still needs some work to get tests to pass again.