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

MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs

@@ -916,6 +916,12 @@ namespace MediaBrowser.Controller.Providers.Movies
                 }
 
                 movie.SetProviderId(MetadataProviders.Imdb, movieData.imdb_id);
+
+                if (movieData.belongs_to_collection != null)
+                {
+                    movie.SetProviderId(MetadataProviders.TmdbCollection, movieData.belongs_to_collection.id.ToString(CultureInfo.InvariantCulture));
+                }
+
                 float rating;
                 string voteAvg = movieData.vote_average.ToString(CultureInfo.InvariantCulture);
                 //tmdb appears to have unified their numbers to always report "7.3" regardless of country

MediaBrowser.Model/Entities/MetadataProviders.cs

@@ -29,6 +29,10 @@ namespace MediaBrowser.Model.Entities
         /// <summary>
         /// The rotten tomatoes
         /// </summary>
-        RottenTomatoes
+        RottenTomatoes,
+        /// <summary>
+        /// Tmdb Collection Id
+        /// </summary>
+        TmdbCollection
     }
 }

MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -111,6 +111,9 @@
     <Content Include="dashboard-ui\css\images\items\searchhints\tv.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\css\images\media\settings.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\css\images\rotten.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

MediaBrowser.sln

@@ -173,7 +173,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 EndGlobal