Merge remote-tracking branch 'origin/master'

Conflicts:
	TheClient/ConsoleApplication1/Ship.cpp
	TheClient/ConsoleApplication1/Ship.h