Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/spacecrack/controllers/GameController.java
	src/main/webapp/js/controllers/GameController.js
	src/test/java/be/kdg/spacecrack/integrationtests/IntegrationGameControllerTests.java