Merge branch 'Tavern' of github.com:Catobat/ALttPDoorRandomizer into Catobat-Tavern

# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
Note: rom is not correct

resources/app/cli/args.json

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

resources/app/cli/lang/en.json

@@ -315,6 +315,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)"
     ],