Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/spacecrack/controllers/ActionController.java
	src/main/java/be/kdg/spacecrack/controllers/GameController.java
	src/main/java/be/kdg/spacecrack/services/GameService.java
	src/main/java/be/kdg/spacecrack/services/GameSynchronizer.java
	src/test/java/be/kdg/spacecrack/unittests/GameServiceTests.java
	src/test/java/be/kdg/spacecrack/unittests/ReplayTests.java

merge-conflicts opgelost