Fixed template description, removed conflict backup files - plg_editors_codemirror.ini