Fixed some VS level 4 warnings, disabled some pedantic level 4 warnings
Fixed some VS level 4 warnings, disabled some pedantic level 4 warnings

Conflicts:
	wcm/filehighlighting.cpp
Merge branch 'master' into highlighting