Some fixes in the server
Merge branch 'develop' of https://github.com/golvmopp/BGSEP into develop

Conflicts:
	VirtualGamepadHost/src/bluetooth/BluetoothClient.java
	server.jar