Merge branch 'dev' into dev_skillslist

# Conflicts:
#	CHANGELOG.md
#	system/lang/en-en.json
#	system/lang/fr-fr.json
#	system/scripts/actor.js
#	system/scripts/actors/base-character-sheet.js
#	system/scripts/combat.js
#	system/scripts/config.js
#	system/scripts/dice/dice-picker-dialog.js
#	system/scripts/dice/roll-n-keep-dialog.js
#	system/scripts/gm/gm-monitor.js
#	system/scripts/gm/gm-toolbox.js
#	system/scripts/hooks.js
#	system/scripts/items/technique-sheet.js
#	system/scripts/main-l5r5e.js
#	system/scripts/migration.js
#	system/scripts/preloadTemplates.js
#	system/scripts/settings.js
#	system/scripts/socket-handler.js
#	system/styles/l5r5e.css
#	system/system.json
#	system/templates/actors/character-sheet.html

system/lang/en-en.json

@@ -18,35 +18,42 @@
             "Title": "Use custom techniques",
             "Hint": "Add 'Specificity' technique type to serve as a catch-all."
         },
+        "CustomCompendiumName": {
+            "Title": "Custom Compendium Name",
+            "Hint": "For advanced users that want to change the name of the custom compendiums (Used to disables the embedded ones).",
+            "Notification": "Unable set Custom Compendium: '{name}'. Is it activated and registered with Babele?"
+        },
         "DefaultSkillsList": {
             "Title": "Skills",
             "Label": "Set Default Skills",
             "Hint": "Set default skills list for new characters."
         }
     },
-    "ACTOR": {
-        "TypeCharacter": "Player Character",
-        "TypeNpc": "Non-Player Character",
-        "TypeArmy": "Army"
-    },
-    "ITEM": {
-        "TypeSkill": "Skill",
-        "TypeItem": "Item",
-        "TypeArmor": "Armor",
-        "TypeWeapon": "Weapon",
-        "TypeTechnique": "Technique",
-        "TypeProperty": "Property",
-        "TypePeculiarity": "Peculiarity",
-        "TypeAdvancement": "Advancement",
-        "TypeTitle": "Title",
-        "TypeBond": "Bond",
-        "TypeSignature_scroll": "Signature Scroll",
-        "TypeItem_pattern": "Item Pattern",
-        "TypeArmy_fortification": "Fortification",
-        "TypeArmy_cohort": "Cohort"
-    },
-    "JOURNAL": {
-        "TypeJournal": "Journal"
+    "TYPES": {
+        "Actor": {
+            "character": "Player Character",
+            "npc": "Non-Player Character",
+            "army": "Army"
+        },
+        "Item": {
+            "skill": "Skill",
+            "item": "Item",
+            "armor": "Armor",
+            "weapon": "Weapon",
+            "technique": "Technique",
+            "property": "Property",
+            "peculiarity": "Peculiarity",
+            "advancement": "Advancement",
+            "title": "Title",
+            "bond": "Bond",
+            "signature_scroll": "Signature Scroll",
+            "item_pattern": "Item Pattern",
+            "army_fortification": "Fortification",
+            "army_cohort": "Cohort"
+        },
+        "Journal": {
+            "journal": "Journal"
+        }
     },
     "l5r5e": {
         "global": {
@@ -179,6 +186,7 @@
             "monitor": {
                 "title": "GM Monitor",
                 "switch_view": "Switch View",
+                "add_selected_tokens": "Add selected tokens",
                 "honor_glory_status": "H/G/S",
                 "focus_vigilance": "Foc./Vig.",
                 "mouse_control": "Right click +1, left: -1, middle: reset to 0"
@@ -479,7 +487,7 @@
                 "honor": "Honor",
                 "access": "Technique types available",
                 "school_ability": "School ability",
-                "starting_techniques": "Starting techniques (2-5)",
+                "starting_techniques": "Starting techniques (2-6)",
                 "outfit": "Starting outfit",
                 "q4": "4. How does your character stand out within their school? (p. 88)",
                 "q4_pow": "4. What gets your character in and out of trouble? (p. 60)"