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

4 files changed, 23 insertions, 6 deletions

diff --git a/MediaBrowser.Model/Dto/GameSystemSummary.cs b/MediaBrowser.Model/Dto/GameSystemSummary.cs
index 79f4e73d5..1da3bb0ac 100644
--- a/MediaBrowser.Model/Dto/GameSystemSummary.cs
+++ b/MediaBrowser.Model/Dto/GameSystemSummary.cs
@@ -14,6 +14,12 @@ namespace MediaBrowser.Model.Dto
         public string Name { get; set; }
 
         /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string DisplayName { get; set; }
+        
+        /// <summary>
         /// Gets or sets the game count.
         /// </summary>
         /// <value>The game count.</value>
@@ -26,6 +32,12 @@ namespace MediaBrowser.Model.Dto
         public List<string> GameFileExtensions { get; set; }
 
         /// <summary>
+        /// Gets or sets the client installed game count.
+        /// </summary>
+        /// <value>The client installed game count.</value>
+        public int ClientInstalledGameCount { get; set; }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="GameSystemSummary"/> class.
         /// </summary>
         public GameSystemSummary()
diff --git a/MediaBrowser.Model/Entities/MetadataFields.cs b/MediaBrowser.Model/Entities/MetadataFields.cs
index a432e1124..85f2da31e 100644
--- a/MediaBrowser.Model/Entities/MetadataFields.cs
+++ b/MediaBrowser.Model/Entities/MetadataFields.cs
@@ -37,6 +37,10 @@ namespace MediaBrowser.Model.Entities
         /// <summary>
         /// The runtime
         /// </summary>
-        Runtime
+        Runtime,
+        /// <summary>
+        /// The official rating
+        /// </summary>
+        OfficialRating
     }
 }
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 8b0910acc..71c3d59cd 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -52,11 +52,6 @@ namespace MediaBrowser.Model.Querying
         HomePageUrl,
 
         /// <summary>
-        /// Child count, recursive child count, etc
-        /// </summary>
-        ItemCounts,
-
-        /// <summary>
         /// The fields that the server supports indexing on
         /// </summary>
         IndexOptions,
diff --git a/MediaBrowser.Model/Querying/ItemQuery.cs b/MediaBrowser.Model/Querying/ItemQuery.cs
index 45af17b0f..69c79104a 100644
--- a/MediaBrowser.Model/Querying/ItemQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemQuery.cs
@@ -93,6 +93,12 @@ namespace MediaBrowser.Model.Querying
         public string[] Genres { get; set; }
 
         /// <summary>
+        /// Limit results to items containing specific genres
+        /// </summary>
+        /// <value>The genres.</value>
+        public string[] AllGenres { get; set; }
+        
+        /// <summary>
         /// Limit results to items containing specific studios
         /// </summary>
         /// <value>The studios.</value>