Merge branch '3.0' into videojs-hls

www/js/player.js

@@ -1305,7 +1305,8 @@
     us: UstreamPlayer,
     im: ImgurPlayer,
     vm: VideoJSPlayer,
-    hl: HLSPlayer
+    hl: HLSPlayer,
+    sb: VideoJSPlayer
   };
 
   window.loadMediaPlayer = function(data) {

www/js/util.js

@@ -54,6 +54,8 @@ function formatURL(data) {
             return "http://hitbox.tv/" + data.id;
         case "hl":
             return data.id;
+        case "sb":
+            return "https://streamable.com/" + data.id;
         default:
             return "#";
     }
@@ -1375,6 +1377,13 @@ function parseMediaLink(url) {
         };
     }
 
+    if((m = url.match(/streamable\.com\/([\w-]+)/))) {
+        return {
+            id: m[1],
+            type: "sb"
+        };
+    }
+
     /*  Shorthand URIs  */
     // To catch Google Plus by ID alone
     if ((m = url.match(/^(?:gp:)?(\d{21}_\d{19}_\d{19})/))) {