Merge branch 'master' of https://github.com/pioneerspacesim/pioneer.git into mod

Conflicts:
	data/ships/dsminer.lua

konflikt rozwiązany

Nowe:
	data/ships/amphiesma.lua
	data/ships/molamola.lua
	data/ships/pumpkinseed.lua
	data/ships/venturestar.lua