Merge remote-tracking branch 'origin/master' into mark-rounding-inference

java/com.sap.sailing.domain.igtimiadapter/build.properties

@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               WEB-INF/

java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/websocket/WebSocketConnectionManager.java

@@ -178,6 +178,7 @@ public class WebSocketConnectionManager extends WebSocketAdapter implements Live
                 try {
                     if (!receivedServerHeartbeatInInterval) {
                         logger.info("Didn't receive server heartbeat in interval for "+this+". Reconnecting...");
+                        client.stop();
                         reconnect();
                     }
                 } catch (Exception e) {