Merge rc1/master

htroot/Status.java

@@ -247,7 +247,7 @@ public class Status
         } else if ( Seed.PEERTYPE_PRINCIPAL.equals(peerStatus) ) {
             prop.put(PEERSTATUS, "3");
             prop.put("hintStatusPrincipal", "1");
-            prop.put("hintStatusPrincipal_seedURL", sb.peers.mySeed().get(Seed.SEEDLISTURL, "?"));
+            prop.putHTML("hintStatusPrincipal_seedURL", sb.peers.mySeed().get(Seed.SEEDLISTURL, "?"));
         }
         prop.putHTML("peerName", thisName);
         prop.put("hash", thisHash);

htroot/api/feed.java

@@ -74,7 +74,7 @@ public class feed {
                 prop.putXML("item_" + messageCount + "_description", message.getDescription());
                 prop.putXML("item_" + messageCount + "_link", message.getLink());
                 prop.put("item_" + messageCount + "_pubDate", message.getPubDate());
-                prop.put("item_" + messageCount + "_guid", message.getGuid());
+                prop.putXML("item_" + messageCount + "_guid", message.getGuid());
                 messageCount++;
                 messageMaxCount--;
             }