back to html text edit
i18n activeadmin
merge conflict on admin/projects/*