Merge branch 'Developer' into ShipNetwork
Merge branch 'Developer' into ShipNetwork
Merge branch 'ShipNetwork' of github.com:gametechnology/psi-2013 into ShipNetwork
With Hugo; Added ProxyShip and RealShip;
With Hugo; Added ShipInterFace; Basic setup proxies;
added a special proxy ship for the server so it can hold more data which it needs
changed the captial f to a normal f
made a new folder ship to organize it a little
implementing the ship as a proxy not finished
fixed that the proxy ship is invisible
added/changed network code for the ships
fix with moving the other ship
Rremoved code for correct init of Ship;
check only own health and set health 0 to test
removed debug text, added extra text in helptext for powerstation
With Hugo; Rotated proxyships; Rotated models for correct display in ProxyShip and Ship;
Merge remote-tracking branch 'origin/Developer' into ShipNetwork

Conflicts:
	build/Stella Incognita.vcxproj
	build/Stella Incognita.vcxproj.filters
	lib/EngineDebug/engine.lib
	source/Game/GameScene.cpp
	source/Game/GameScene.h
	source/Game/Ship.cpp
fixed small merge errors
Removed arrow keys bug, caused by powerstation scrollbars
Merge branch 'ShipNetwork' into Developer