Update dfAceEditor.  Fix reset editor.
Merge remote-tracking branch 'origin/develop' into develop