Merge branch 'develop' into vsfix
fix vs compile errors
Merge branch 'vsfix' into mapgen
Merge remote-tracking branch 'madrman/mapgen' into mapgen
fix compile