Merge branch 'DoorDevUnstable' into DoorDevVolatile

# Conflicts:
#	Main.py
#	MultiClient.py
#	Rom.py
#	data/base2current.bps
#	resources/app/gui/lang/en.json
#	resources/app/gui/randomize/item/widgets.json
#	source/gui/bottom.py
#	source/gui/widgets.py

EntranceShuffle.py

@@ -2171,6 +2171,8 @@ mandatory_connections = [('Links House S&Q', 'Links House'),
                          ('West Dark World Gap', 'West Dark World'),
                          ('Broken Bridge Pass (Top)', 'East Dark World'),
                          ('Broken Bridge Pass (Bottom)', 'Northeast Dark World'),
+                         ('Dark Graveyard Bush (South)', 'Dark Graveyard North'),
+                         ('Dark Graveyard Bush (North)', 'West Dark World'),
                          ('Peg Area Rocks (Left)', 'Hammer Peg Area'),
                          ('Peg Area Rocks (Right)', 'West Dark World'),
                          ('Village of Outcasts Heavy Rock', 'West Dark World'),