Merge remote-tracking branch 'origin/0.1' into dapper

# Conflicts:
#	web/App_Code/Model/Model.Designer.cs
#	web/App_Code/Model/Model.cs
#	web/App_Code/Model/Model.edmx
#	web/web.config

web/App_Code/Model/Model.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     這個程式碼是由範本產生。
 //
@@ -187,6 +187,7 @@ namespace Model
         public string pageSize { get; set; }
         public string printSize { get; set; }
         public string defaultStyle { get; set; }
+        public Nullable<int> sort_order { get; set; }
     
         public virtual actItem_kind actItem_kind { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]