Merge branch 'master' into feature-custom-buffs

# Conflicts:
#	rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
#	rpg-docs/client/views/character/spells/spellDialog/spellDialog.html

rpg-docs/Model/Character/Characters.js

@@ -185,6 +185,7 @@ Schemas.Character = new SimpleSchema({
 		defaultValue: "whitelist",
 		allowedValues: ["whitelist", "public"],
 	},
+	"settings.swapStatAndModifier": {type: Boolean, defaultValue: false},
 	"settings.exportFeatures": {type: Boolean, defaultValue: true},
 	"settings.exportAttacks": {type: Boolean, defaultValue: true},
 	"settings.exportDescription": {type: Boolean, defaultValue: true},

rpg-docs/Model/Library/LibraryAttacks.js

@@ -11,13 +11,11 @@ Schemas.LibraryAttacks = new SimpleSchema({
 	},
 	attackBonus: {
 		type: String,
-		defaultValue: "strengthMod + proficiencyBonus",
 		optional: true,
 		trim: false,
 	},
 	damage: {
 		type: String,
-		defaultValue: "1d8 + {strengthMod}",
 		optional: true,
 		trim: false,
 	},