vcp merge
Merge branch 'dev-main' of https://github.com/joezeng/fourstarmon into dev-main

Conflicts:
	projects/vs10/vs10.vcxproj
	projects/vs10/vs10.vcxproj.filters
Audio
and some minor compiler silencing.