M4 Alterations 1

No functionality really changed, most significant is that a shipyard is
on a planet, it isn't a planet. May be changed back after discussion
Merge remote-tracking branch 'origin/master'

Conflicts:

	JavaFXML[SkillInterfaceTest][CS2340]/src/javafxml/skillinterfacetest/cs2340/star_system/Government.java

	JavaFXML[SkillInterfaceTest][CS2340]/src/javafxml/skillinterfacetest/cs2340/star_system/Planet.java