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

InABox.Core/DataModel/DataModelTemplate.cs

@@ -15,34 +15,26 @@ namespace InABox.Core
         public string Name { get; set; }
 
         [EditorSequence(2)]
-        [ExpressionEditor(null, Editable = Editable.Enabled)]
+        [TextBoxEditor(Editable = Editable.Enabled)]
         public string To { get; set; }
 
         [EditorSequence(3)]
-        [ExpressionEditor(null, Editable = Editable.Enabled)]
-        public string CC { get; set; }
-
-        [EditorSequence(4)]
-        [ExpressionEditor(null, Editable = Editable.Enabled)]
-        public string BCC { get; set; }
-
-        [EditorSequence(5)]
-        [ExpressionEditor(null, Editable = Editable.Enabled)]
+        [TextBoxEditor(Editable = Editable.Enabled)]
         public string Subject { get; set; }
 
-        [EditorSequence(6)]
-        [ExpressionEditor(null, Editable = Editable.Enabled)]
+        [EditorSequence(4)]
+        [TextBoxEditor(Editable = Editable.Enabled)]
         public string AttachmentName { get; set; }
 
-        [EditorSequence(7)]
-        [ScriptEditor(SyntaxLanguage.HTML, Editable = Editable.Enabled)]
+        [EditorSequence(5)]
+        [TextBoxEditor(Editable = Editable.Enabled)]
         public string Template { get; set; }
 
-        [EditorSequence(8)]
+        [EditorSequence(6)]
         [CheckBoxEditor]
         public bool Visible { get; set; }
 
-        [EditorSequence(9)]
+        [EditorSequence(7)]
         [CheckBoxEditor]
         public bool Default { get; set; }