Update dfAceEditor.  Format json data properly
Merge remote-tracking branch 'origin/develop' into develop