Merge branch 'master' into Dev-Vlyan

# Conflicts:
#	system/l5r-ui/ui/cursors/normal.webp

system/template.json

@@ -2,7 +2,7 @@
     "Actor": {
         "types": ["character"],
         "templates": {
-            "identity" : {
+            "identity": {
                 "clan": "",
                 "family": "",
                 "school": "",
@@ -18,8 +18,8 @@
                     "void": 1
                 }
             },
-            "social_standing": {
-                "social_standing": {
+            "social": {
+                "social": {
                     "honor": 0,
                     "glory": 0,
                     "status": 0,
@@ -102,25 +102,23 @@
             }
         },
         "character": {
-            "templates": ["identity", "rings", "social", "category", "conflict", "experience"],
+            "templates": ["identity", "rings", "social", "skills", "conflict", "xp"],
             "notes": "",
             "feats": []
         }
     },
-
     "Item": {
-        "types": ["item", "weapon", "feat"],
+        "types": ["item", "weapon", "feat", "xp-advancement"],
         "item": {
             "description": "",
             "quantity": 1,
             "weight": 0
         },
-        "weapon" : {
+        "weapon": {
             "quantity": 1,
             "weight": 0,
             "description": "",
             "damage": 0,
-            "deadliness": 0,
             "range": 0,
             "properties": ""
         },