Merge branch 'master' of https://github.com/lanryZhang/lanry.Framwork

Signed-off-by: lanryZhang <hookyzlr@163.com>
v1
2
1
1
Merge branch 'Developer' of https://github.com/lanryZhang/lanry.Framwork into Developer
Merge branch 'Developer' of https://github.com/lanryZhang/lanry.Framwork into Developer
Merge branch 'Developer' of https://github.com/lanryZhang/lanry.Framwork into Developer
Merge branch 'master' of https://github.com/lanryZhang/lanry.Framwork

Signed-off-by: lanryZhang <hookyzlr@163.com>
Merge branch 'Developer' of github.com:lanryZhang/lanry.Framework into Developer
Merge branch 'Developer' of github.com:lanryZhang/lanry.Framework into Developer
Merge branch 'Developer' of github.com:lanryZhang/lanry.Framework into Developer

Signed-off-by: lanryZhang <hookyzlr@163.com>
Merge branch 'Developer' of https://github.com/lanryZhang/lanry.Framework into Developer

Conflicts:
	Framework/.gitignore
	Framework/Lanry.DataAccess/Lanry.DataAccess.csproj
	Framework/Lanry.DataAccess/Lanry.DataAccess.csproj.user
	Framework/Lanry.DataAccess/Properties/AssemblyInfo.cs
	Framework/Lanry.DataAccess/Sql/Common/ProcedureName.cs
	Framework/Lanry.DataAccess/Sql/Common/SqlDataType.cs
	Framework/Lanry.DataAccess/Sql/Common/SqlJoinType.cs
	Framework/Lanry.DataAccess/Sql/Common/SqlParameter.cs
	Framework/Lanry.DataAccess/Sql/Common/SqlSelect.cs
	Framework/Lanry.DataAccess/Sql/Common/SqlSortType.cs
	Framework/Lanry.DataAccess/Sql/Common/SqlTable.cs
	Framework/Lanry.DataAccess/Sql/Common/SqlWhere.cs
	Framework/Lanry.DataAccess/Sql/Common/SqlWhereType.cs
	Framework/Lanry.DataAccess/Sql/Interface/ISqlQuery.cs
	Framework/Lanry.DataAccess/Sql/SqlProvider/SqlServerProvider.cs
	Framework/Lanry.DataAccess/Sql/SqlQuery/SqlQueryFactory.cs
	Framework/Lanry.DataAccess/SqlCache/SqlQueryCache.cs
	Framework/Lanry.Facade/Lanry.Facade.csproj
	Framework/Lanry.Facade/Properties/AssemblyInfo.cs
	Framework/Lanry.Framework.Tests/App.config
	Framework/Lanry.Framework.Tests/Controllers/AccountControllerTest.cs
	Framework/Lanry.Framework.Tests/Controllers/HomeControllerTest.cs
	Framework/Lanry.Framework.Tests/Lanry.Framework.Tests.csproj
	Framework/Lanry.Framework.Tests/Properties/AssemblyInfo.cs
	Framework/Lanry.Framework.sln
	Framework/Lanry.Framework/Config/DataBase.config
	Framework/Lanry.Framework/Config/Route.config
	Framework/Lanry.Framework/Content/Site.css
	Framework/Lanry.Framework/Content/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-bg_glass_75_dadada_1x400.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-icons_222222_256x240.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-icons_2e83ff_256x240.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-icons_454545_256x240.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-icons_888888_256x240.png
	Framework/Lanry.Framework/Content/themes/base/images/ui-icons_cd0a0a_256x240.png
	Framework/Lanry.Framework/Content/themes/base/jquery-ui.css
	Framework/Lanry.Framework/Controllers/Default1Controller.cs
	Framework/Lanry.Framework/Controllers/HomeController.cs
	Framework/Lanry.Framework/Controllers/ListController.cs
	Framework/Lanry.Framework/Controllers/TestController.cs
	Framework/Lanry.Framework/Global.asax
	Framework/Lanry.Framework/Global.asax.cs
	Framework/Lanry.Framework/Lanry.Framework.csproj
	Framework/Lanry.Framework/Lanry.Framework.csproj.user
	Framework/Lanry.Framework/Properties/AssemblyInfo.cs
	Framework/Lanry.Framework/RouteEngine.cs
	Framework/Lanry.Framework/Scripts/MicrosoftAjax.debug.js
	Framework/Lanry.Framework/Scripts/MicrosoftAjax.js
	Framework/Lanry.Framework/Scripts/MicrosoftMvcAjax.debug.js
	Framework/Lanry.Framework/Scripts/MicrosoftMvcAjax.js
	Framework/Lanry.Framework/Scripts/MicrosoftMvcValidation.debug.js
	Framework/Lanry.Framework/Scripts/MicrosoftMvcValidation.js
	Framework/Lanry.Framework/Scripts/jquery-1.4.4-vsdoc.js
	Framework/Lanry.Framework/Scripts/jquery-1.4.4.js
	Framework/Lanry.Framework/Scripts/jquery-1.4.4.min.js
	Framework/Lanry.Framework/Scripts/jquery-ui.js
	Framework/Lanry.Framework/Scripts/jquery-ui.min.js
	Framework/Lanry.Framework/Scripts/jquery.unobtrusive-ajax.js
	Framework/Lanry.Framework/Scripts/jquery.unobtrusive-ajax.min.js
	Framework/Lanry.Framework/Scripts/jquery.validate-vsdoc.js
	Framework/Lanry.Framework/Scripts/jquery.validate.js
	Framework/Lanry.Framework/Scripts/jquery.validate.min.js
	Framework/Lanry.Framework/Scripts/jquery.validate.unobtrusive.js
	Framework/Lanry.Framework/Scripts/jquery.validate.unobtrusive.min.js
	Framework/Lanry.Framework/Views/Account/ChangePassword.cshtml
	Framework/Lanry.Framework/Views/Account/ChangePasswordSuccess.cshtml
	Framework/Lanry.Framework/Views/Account/LogOn.cshtml
	Framework/Lanry.Framework/Views/Account/Register.cshtml
	Framework/Lanry.Framework/Views/Home/About.cshtml
	Framework/Lanry.Framework/Views/Home/Name.cshtml
	Framework/Lanry.Framework/Views/List/GetList.cshtml
	Framework/Lanry.Framework/Views/List/NameList.cshtml
	Framework/Lanry.Framework/Views/Shared/Error.cshtml
	Framework/Lanry.Framework/Views/Shared/_Layout.cshtml
	Framework/Lanry.Framework/Views/Test/Index.cshtml
	Framework/Lanry.Framework/Views/Web.config
	Framework/Lanry.Framework/Views/_ViewStart.cshtml
	Framework/Lanry.Framework/Web.Debug.config
	Framework/Lanry.Framework/Web.Release.config
	Framework/Lanry.Framework/Web.config
	Framework/Lanry.Model/Lanry.Model.csproj
	Framework/Lanry.Model/Properties/AssemblyInfo.cs
	Framework/Lanry.Repository/Lanry.Repository.csproj
	Framework/Lanry.Repository/Properties/AssemblyInfo.cs
	Framework/Lanry.Utility/Attributes/ActionAttribute.cs
	Framework/Lanry.Utility/Attributes/ControllerAttibute.cs
	Framework/Lanry.Utility/Attributes/ElementPropertyAttribute.cs
	Framework/Lanry.Utility/Attributes/EnumDescriptionAttribute.cs
	Framework/Lanry.Utility/Attributes/ParameterAttribute.cs
	Framework/Lanry.Utility/Attributes/PropertyAttibute.cs
	Framework/Lanry.Utility/Attributes/TableAttribute.cs
	Framework/Lanry.Utility/Collection/DataList.cs
	Framework/Lanry.Utility/ConfigHelper/ConfigToDataObject.cs
	Framework/Lanry.Utility/ConfigHelper/ConfigurationBroker.cs
	Framework/Lanry.Utility/ConfigHelper/ConfigurationSettings.cs
	Framework/Lanry.Utility/ConfigHelper/ElementInfomation.cs
	Framework/Lanry.Utility/ConfigHelper/ElementInfomationCollection.cs
	Framework/Lanry.Utility/Configuration/ConnectionConfig.cs
	Framework/Lanry.Utility/Configuration/DBMappingConfig.cs
	Framework/Lanry.Utility/Configuration/RouteConfig.cs
	Framework/Lanry.Utility/Constant/HttpVerbs.cs
	Framework/Lanry.Utility/Helper/CacheHelper.cs
	Framework/Lanry.Utility/Helper/ExceptionHelper.cs
	Framework/Lanry.Utility/Lanry.Utility.csproj
	Framework/Lanry.Utility/Lanry.Utility.csproj.user
	Framework/Lanry.Utility/ORM/ORM.cs
	Framework/Lanry.Utility/Properties/AssemblyInfo.cs
	Framework/Lanry.Web/Lanry.Web.csproj
	Framework/Lanry.Web/Lanry.Web.csproj.user
	Framework/Lanry.Web/Properties/AssemblyInfo.cs
	Framework/Lanry.Web/RouteBaseEngine.cs
	Framework/Lanry.Web/RouteEngine.cs
	Framework/Lanry.Web/RouteParamReg.cs
	Framework/ORM/ORM.csproj
	Framework/ORM/Properties/AssemblyInfo.cs
	Framework/README.md
v1
v1
Merge branch 'Developer' of https://github.com/lanryZhang/lanry.Framework into Developer
Merge pull request #1 from lanryZhang/Developer

Developer