merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	OCS-Server/src/de/speedcube/ocsServer/OCSServer.java
	OCS-Server/src/de/speedcube/ocsServer/PacketHandler.java