Merge origin/master

Conflicts:
	src/models/SolarSystem.java
	src/models/Universe.java
Merge origin/master