Planets dead reckoning
Merge branch 'master' of https://github.com/Belgarion/sputnik
Merge branch 'master' of https://github.com/Belgarion/sputnik

Conflicts:
	src/main/Main.java
	src/network/Client.java
	src/planets/Moon.java
	src/sharedstate/Planet.java
	src/sharedstate/Player.java