cleanup
merged Alxs cleanup.
started uplaod.
upload (not complete)
upload
almost complete with upload
d
Merge pull request #29 from alxdarksage/develop

Minor changes
Some movement, more progress on upload test.
finished upload
merged
Changes for server-side consistency
requested changes.
changed consent document back to study consent
Adding ResourceList, and cleaning up publicly visible classes/methods
Merge pull request #30 from SartoriusEarth/develop

Added upload.
Changes to get the tests working
Merging changes
Merge pull request #31 from alxdarksage/key-consistency

Key consistency
Removing unused imports