Vlyan
6f7b00328e
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