Added JSON mixin stuff
Merge branch 'master' of github.com:PythonUnited/djinn_contenttypes