Merge branch 'version-3-1'

Conflicts:
	src/laws.c

res/core/common/items.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0"?>
 <resources>
 
-  <resource name="money">
-    <item weight="1"/>
-  </resource>
-
   <resource name="ao_healing" appearance="amulet">
     <item weight="0" score="6000"/>
   </resource>

res/items.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<items>
+</items>

src/kernel/order.c

@@ -544,7 +544,8 @@ char *write_order(const order * ord, char *buffer, size_t size)
         keyword_t kwd = ORD_KEYWORD(ord);
         if (kwd == NOKEYWORD) {
             const char *text = ORD_STRING(ord);
-            strlcpy(buffer, (const char *)text, size);
+            if (text) strlcpy(buffer, (const char *)text, size);
+            else buffer[0] = 0;
         }
         else {
             get_command(ord, buffer, size);