Merged editor-xinha.jsp into editor-text.jsp; updated s:url, switching from deprecated id attribute to var.

git-svn-id: https://svn.apache.org/repos/asf/roller/trunk@1615415 13f79535-47bb-0310-9956-ffa450edef68