Merge branch 'Developer' into ShipNetwork
Merge branch 'ShipNetwork' of github.com:gametechnology/psi-2013 into ShipNetwork
With Hugo; Added ProxyShip and RealShip;