Merge branch 'master' into with-dvcs

diff --combined redakcja/static/js/wiki/xslt.js
index 4f562a2,9efeba3..ff36666
--- 1/redakcja/static/js/wiki/xslt.js
--- 2/redakcja/static/js/wiki/xslt.js
+++ b/redakcja/static/js/wiki/xslt.js
@@@ -17,7 -17,7 +17,7 @@@ function withStylesheets(code_block, on
      if (!xml2htmlStylesheet) {
        $.blockUI({message: 'Ładowanie arkuszy stylów...'});
        $.ajax({
 -              url: STATIC_URL + 'xsl/wl2html_client.xsl?20110112',
 +              url: STATIC_URL + 'xsl/wl2html_client.xsl?20110520',
                dataType: 'xml',
                timeout: 10000,
                success: function(data) {
@@@ -40,7 -40,7 +40,7 @@@ function withThemes(code_block, onError
  {
      if (typeof withThemes.canon == 'undefined') {
          $.ajax({
 -            url: '/themes',
 +            url: '/editor/themes',
              dataType: 'text',
              success: function(data) {
                  withThemes.canon = data.split('\n');
@@@ -85,7 -85,7 +85,7 @@@ function xml2html(options) 
              source.text('');
              options.error(error.text(), source_text);
          } else {
 -            options.success(doc.firstChild);
 +            options.success(doc.childNodes);
  
              withThemes(function(canonThemes) {
                  if (canonThemes != null) {
@@@ -253,13 -253,8 +253,13 @@@ HTMLSerializer.prototype.serialize = fu
                                break;
                        case TEXT_NODE:
                                self.result += text_buffer;
-                               text_buffer = token.node.nodeValue;
+                               text_buffer = token.node.nodeValue.replace('&', '&amp;').replace('<', '&lt;');
                                break;
 +            case COMMENT_NODE:
 +                self.result += text_buffer;
 +                text_buffer = '';
 +                self.result += '<!--' + token.node.nodeValue + '-->';
 +                break;
                };
        };
      self.result += text_buffer;