Merge branch 'Customizer' into Synthesis

# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps

resources/app/cli/args.json

@@ -377,6 +377,10 @@
     "action": "store_true",
     "type": "bool"
   },
+  "shuffletavern": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "overworld_map": {
     "choices": [
       "default",

resources/app/cli/lang/en.json

@@ -324,6 +324,9 @@
     "shufflelinks": [
       "Include Link's House in the entrance shuffle pool. (default: %(default)s)"
     ],
+    "shuffletavern": [
+      "Include the back of the tavern in the entrance shuffle pool. (default: %(default)s)"
+    ],
     "overworld_map": [
       "Control if and how the overworld map indicators show the locations of dungeons (default: %(default)s)"
     ],

resources/app/gui/lang/en.json

@@ -137,6 +137,7 @@
     "randomizer.entrance.openpyramid": "Pre-open Pyramid Hole",
     "randomizer.entrance.shuffleganon": "Include Ganon's Tower and Pyramid Hole in shuffle pool",
     "randomizer.entrance.shufflelinks": "Include Link's House in the shuffle pool",
+    "randomizer.entrance.shuffletavern": "Include the back of the tavern in the entrance shuffle pool",
     "randomizer.entrance.overworld_map": "Overworld Map",
     "randomizer.entrance.overworld_map.default": "Default (no location display)",
     "randomizer.entrance.overworld_map.compass": "Compass indicates location",

resources/app/gui/randomize/entrando/widgets.json

@@ -18,6 +18,7 @@
       ]
     },
     "shufflelinks":     { "type": "checkbox" },
+    "shuffletavern":     { "type": "checkbox" },
     "overworld_map": {
       "type": "selectbox",
       "options": [