planet class: planetType corrected, station possible
Merge origin/master

Conflicts:
	core/src/com/lostmekkasoft/spicewars/data/Planet.java
more merge stuff