nastroyka_avtokopirovaniya_setevogo_dvijka
Merge branch 'master' of github.com:PavelPol/worldforever

Conflicts:
	Client/WorkSpace/VS2010/WFClient.sdf
	Client/WorkSpace/VS2010/WFClient.suo
	Server/WorkSpace/VS2010/WFServer.sdf
nastriyka_proekta
Merge branch 'master' of github.com:PavelPol/worldforever

Conflicts:
	Network_Engine/WorkSpace/VS2010/pne.suo
	Server/WorkSpace/VS2010/WFServer.suo