Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs

@@ -41,7 +41,8 @@ namespace MediaBrowser.Controller.Resolvers
                 ".flv",
                 ".f4v",
                 ".3gp",
-                ".webm"
+                ".webm",
+                ".mts"
         };
 
         /// <summary>