cleanup
Merge branch 'jqconsole' into editor