Update
Update
Update
Merge branch 'master' of https://github.com/Ionsto/Alien

Conflicts:
	Alien.sdf
	Alien.v11.suo
	AlienClient/Debug/AlienClient.log
	AlienClient/Debug/CL.write.1.tlog
	AlienClient/Debug/Gui.obj
	AlienClient/Debug/GuiGameHUD.obj
	AlienClient/Debug/GuiObj.obj
	AlienClient/Debug/GuiObjButton.obj
	AlienClient/Debug/GuiObjImage.obj
	AlienClient/Debug/GuiObjImageAnimated.obj
	AlienClient/Debug/GuiObjSlider.obj
	AlienClient/Debug/GuiServerConnect.obj
	AlienClient/Debug/GuiSingleplayer.obj
	AlienClient/Debug/GuiStart.obj
	AlienClient/Debug/Main.obj
	AlienClient/Debug/ObjSatilite.obj
	AlienClient/Debug/World.obj
	AlienClient/Debug/vc110.idb
	AlienClient/Debug/vc110.pdb
	Debug/AlienClient.exe
	Debug/AlienClient.ilk
	Debug/AlienClient.pdb