WIP 0.3.6
Merge branch 'master' into testing
WIP 0.3.7
updated json-forms submodule
updated json-forms submodule
added 0.3.7 changes log entry