Merge remote-tracking branch 'origin/frank' into kenric

InABox.Core/MultiQuery/MultiQuery.cs

@@ -110,6 +110,11 @@ namespace InABox.Core
             return Get(typeof(T));
         }
 
+        public bool Contains<T>()
+        {
+            return Contains(typeof(T));
+        }
+
         #endregion
     }
 }

inabox.wpf/DynamicGrid/DynamicEditorForm/EmbeddedDynamicEditorForm.xaml.cs

@@ -334,7 +334,9 @@ namespace InABox.DynamicGrid
 
         private decimal Editor_OnGetSequence(DynamicGridColumn column)
         {
-            return CoreUtils.GetPropertySequence(_items.First().GetType(), column.ColumnName);
+            if (_items.Any())
+                return CoreUtils.GetPropertySequence(_items.First().GetType(), column.ColumnName);
+            return 0.0M;
         }
 
         private void Editor_OnDefineLookups(ILookupEditorControl editor)

inabox.wpf/DynamicGrid/Editors/LookupEditor/LookupEditorControl.cs

@@ -91,7 +91,7 @@ namespace InABox.DynamicGrid
                 }
             }
 
-            var sel = values.Rows.FirstOrDefault(r => r[keycol].Equals(value));
+            var sel = value != null ? values.Rows.FirstOrDefault(r => r[keycol].Equals(value)) : null;
             if (IsEnumEditor())
                 Editor.SelectedIndex = sel != null ? sel.Index : 0;
             else