DatabaseControlsTest Done
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/s32a/Server/Game.java
	src/main/java/s32a/Server/Player.java