Merge remote-tracking branch 'origin/server-side' into server-side

# Conflicts:
#	android/src/com/aqwsxlostfly/packandgo/client/AndroidLauncher.java
#	android/src/com/aqwsxlostfly/packandgo/client/MessageProcessor.java
#	android/src/com/aqwsxlostfly/packandgo/client/dto/InputStateImpl.java
#	android/src/com/aqwsxlostfly/packandgo/client/ws/EventListenerCallback.java
#	android/src/com/aqwsxlostfly/packandgo/client/ws/WebSocketClient.java
#	core/src/com/aqwsxlostfly/packandgo/InputState.java
#	core/src/com/aqwsxlostfly/packandgo/MessageSender.java
#	core/src/com/aqwsxlostfly/packandgo/TouchProcessor.java