Merge origin/master

Conflicts:
	astroids2/src/main/java/edu/rug/gogp/game/model/SpaceshipServerController.java