Changes for server-side consistency
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
Merge pull request #32 from alxdarksage/key-consistency

Removing unused imports
more work on exceptions.
Alxs changes.