Consolidating ObjectMappers to use our version, which adds type property to JSON objects
Not overwriting type property where it exists
Adding tests for all this new type stuff
Merging
Merge pull request #253 from alxdarksage/json-types

Json types