commit voor den andy
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controllers/JsonController.java
	src/main/java/be/kdg/persistence/api/GameDAOApi.java
	src/main/java/be/kdg/persistence/impl/GameDAOImpl.java
	src/main/java/be/kdg/service/api/GameServiceApi.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controllers/JsonController.java
	src/main/java/be/kdg/persistence/api/GameDAOApi.java
	src/main/java/be/kdg/persistence/impl/GameDAOImpl.java
	src/main/java/be/kdg/service/api/GameServiceApi.java