Merge remote-tracking branch 'MediaBrowser/master' into develop

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.plexkodiconnect"
         name="PlexKodiConnect" 
-        version="1.1.81"
+        version="2.0.0"
         provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>

resources/lib/playbackutils.py

@@ -314,7 +314,7 @@ class PlaybackUtils():
 
         ############### PLAYBACK ################
 
-        if homeScreen and seektime:
+        if homeScreen and seektime and utils.window('emby_customPlaylist') != "true":
             self.logMsg("Play as a widget item.", 1)
             self.setListItem(listitem)
             xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, listitem)

resources/lib/websocket_client.py

@@ -296,7 +296,7 @@ class WebSocket_Client(threading.Thread):
 
         while not monitor.abortRequested():
 
-            self.client.run_forever()
+            self.client.run_forever(ping_interval = 10)
             if self.stopWebsocket:
                 break