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

MediaBrowser.Model/Querying/ItemsByNameQuery.cs

@@ -67,12 +67,15 @@ namespace MediaBrowser.Model.Querying
         /// <value>The sort by.</value>
         public string[] SortBy { get; set; }
 
+        public ImageType[] ImageTypes { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ItemsByNameQuery"/> class.
         /// </summary>
         public ItemsByNameQuery()
         {
-            Fields = new ItemFields[] {};
+            ImageTypes = new ImageType[] { };
+            Fields = new ItemFields[] { };
             Recursive = true;
             MediaTypes = new string[] { };
             SortBy = new string[] { };

MediaBrowser.Model/Querying/PersonsQuery.cs

@@ -1,4 +1,5 @@
-
+using MediaBrowser.Model.Entities;
+
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>

MediaBrowser.Model/System/SystemInfo.cs

@@ -72,7 +72,13 @@ namespace MediaBrowser.Model.System
         /// </summary>
         /// <value>The program data path.</value>
         public string ProgramDataPath { get; set; }
-        
+
+        /// <summary>
+        /// Gets or sets the HTTP server port number.
+        /// </summary>
+        /// <value>The HTTP server port number.</value>
+        public int HttpServerPortNumber { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SystemInfo"/> class.
         /// </summary>