Updated json-forms
Merge branch 'master' into server-api