Droga de TORTOISE
Merge branch 'master' of https://github.com/LedZeppelinbr/src

Conflicts:
	EclipseStudio/Sources/UI/FrontEndWarZ.cpp
	ServerNetPackets/NetPacketsGameInfo.h