PLANET BODY
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.xml
	src/MasterPilot.java
	src/Planet.java
	src/ShuttleFactory.java