Merge branch 'master' of https://github.com/gossipgirls/SpaceTraders2
Merge branch 'master' of https://github.com/gossipgirls/SpaceTraders2
planet pmd changes