Updated editor.cfm files to avoid merge conflict
Update to remote