Merge pull request #6238 from IOSYN/patch-1

[fix] Boobytrap disarm
Merge pull request #6237 from Soyweiser/Lighten_up

Changed "dark road" into "Surrounded start"
Conflicts:
	src/options.cpp
Merge pull request #6242 from illi-kun/msvc_projects

Update of MSVC projects
Merge pull request #6247 from BevapDin/fix-bug-in-trap

Fix bug in trapfunc sinkhole
Merge pull request #6246 from Soyweiser/Everything_is_a_nail

Construction recipe toolset inclusions.