Disables dmcamera/minimap when not running as DM
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectFolder/Assembly-CSharp-vs.csproj
	ProjectFolder/Assets/sprites/Environment/television_back.png.meta
	ProjectFolder/Assets/sprites/Environment/torch sprites.meta
	ProjectFolder/Assets/sprites/Environment/torch sprites/torch_1.png.meta
	ProjectFolder/Assets/sprites/Environment/torch sprites/torch_2.png.meta
	ProjectFolder/Assets/sprites/Environment/torch sprites/torch_3.png.meta
	ProjectFolder/Assets/sprites/Environment/torch sprites/torch_4.png.meta
	ProjectFolder/Assets/sprites/Environment/torch sprites/torch_5.png.meta
	ProjectFolder/Assets/sprites/Environment/torch sprites/torch_6.png.meta
	ProjectFolder/Assets/sprites/Environment/torch sprites/torch_7.png.meta
	ProjectFolder/Assets/sprites/Environment/vase.png.meta
	ProjectFolder/Assets/sprites/Environment/washing_machine.png.meta
	ProjectFolder/Assets/sprites/NPCs/spike_trap.png.meta
	ProjectFolder/Assets/sprites/NPCs/spike_trap_activated.png.meta