no message
Merge branch 'master' of https://github.com/nkornek/Spaceship

Conflicts:
	SpaceShip/SpaceShip-csharp.sln
	SpaceShip/SpaceShip.sln