Merge branch 'master' into JuliusesNyeSuperBranch

# Conflicts:
#	MrBigsock/Assets/Prefabs/MapObjects/Canvas.controller
#	MrBigsock/Assets/Prefabs/MapObjects/Canvas.controller.meta
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedChest.controller
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedChest.controller.meta
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedChest.prefab
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedChest.prefab.meta
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedDoor.controller
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedDoor.controller.meta
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedDoor.prefab
#	MrBigsock/Assets/Prefabs/MapObjects/ClosedDoor.prefab.meta
#	MrBigsock/Assets/Prefabs/MapObjects/OpenDoor.prefab
#	MrBigsock/Assets/Prefabs/MapObjects/OpenDoor.prefab.meta
#	MrBigsock/Assets/Prefabs/MapObjects/OpeningGoldChest.anim
#	MrBigsock/Assets/Prefabs/MapObjects/OpeningGoldChest.anim.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/coffee.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/coffee.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/elixirofspeed.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/elixirofspeed.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/foureyes.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/foureyes.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/lunch.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/lunch.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/plasticstraw.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/plasticstraw.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/premature.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/premature.png.meta
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/runningshoes.png
#	MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/Individual Sprite/Attack/runningshoes.png.meta
#	MrBigsock/Assets/Resources/Sprites/Item/Canvas.controller
#	MrBigsock/Assets/Resources/Sprites/Item/Canvas.controller.meta
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedChest.controller
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedChest.controller.meta
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedChest.prefab
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedChest.prefab.meta
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedDoor.controller
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedDoor.controller.meta
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedDoor.prefab
#	MrBigsock/Assets/Resources/Sprites/Item/ClosedDoor.prefab.meta
#	MrBigsock/Assets/Resources/Sprites/Item/OpenDoor.prefab
#	MrBigsock/Assets/Resources/Sprites/Item/OpenDoor.prefab.meta
#	MrBigsock/Assets/Resources/Sprites/Item/OpeningGoldChest.anim
#	MrBigsock/Assets/Resources/Sprites/Item/OpeningGoldChest.anim.meta
#	MrBigsock/Assets/Sprites/Item/Canvas.controller
#	MrBigsock/Assets/Sprites/Item/Canvas.controller.meta
#	MrBigsock/Assets/Sprites/Item/ClosedChest.controller
#	MrBigsock/Assets/Sprites/Item/ClosedChest.controller.meta
#	MrBigsock/Assets/Sprites/Item/ClosedChest.prefab
#	MrBigsock/Assets/Sprites/Item/ClosedChest.prefab.meta
#	MrBigsock/Assets/Sprites/Item/ClosedDoor.controller
#	MrBigsock/Assets/Sprites/Item/ClosedDoor.controller.meta
#	MrBigsock/Assets/Sprites/Item/ClosedDoor.prefab
#	MrBigsock/Assets/Sprites/Item/ClosedDoor.prefab.meta
#	MrBigsock/Assets/Sprites/Item/OpenDoor.prefab
#	MrBigsock/Assets/Sprites/Item/OpenDoor.prefab.meta
#	MrBigsock/Assets/Sprites/Item/OpeningGoldChest.anim
#	MrBigsock/Assets/Sprites/Item/OpeningGoldChest.anim.meta