Merge branch 'develop' of github.com:josdejong/jsoneditor into develop

Merge branch 'develop' of github.com:josdejong/jsoneditor into develop #180