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

Conflicts:
	data/factions/01_default.lua
	data/factions/02_federation.lua
	data/factions/03_CIS.lua
	data/factions/04_red.lua

Rozwiązane.