[mr2814] fix win compile problems in last commits (thx to all).
SD2 update
[mr2815] next try to fix win compile
Merge branch 'master' into testing

Conflicts:
	src/game/Transports.cpp