add JSON edit directive
Merge branch 'demo' into develop