switch station for both ships using a request
Merge branch 'feature_join_station' of github.com:gametechnology/psi-2013 into feature_join_station

Conflicts:
	source/Game/Ship.cpp