提交代码
提交代码
提交代码
提交代码
提交代码
提交代码
Merge branch 'master' of https://github.com/codezyc/MyFramework

Conflicts:
	Framework/CommonLibary/Base64Utils.cs
	Framework/CommonLibary/Cache/CacheUtils.cs
	Framework/CommonLibary/ConfigFileUtils.cs
	Framework/CommonLibary/CustomeJSON.NET/KeysJsonConverter .cs
	Framework/CommonLibary/DateUtils.cs
	Framework/CommonLibary/EnumUtils.cs
	Framework/CommonLibary/EnvironmentUtils.cs
	Framework/CommonLibary/IEnumerableExtension.cs
	Framework/CommonLibary/JSONUtils.cs
	Framework/CommonLibary/ReflectionUtils.cs
	Framework/CommonLibary/StringUtils.cs
	Framework/CommonLibary/XMLUtils.cs
	Framework/MVCExtend/CustomeAttribute/LayoutAttribute.cs
	Framework/MVCExtend/Extensions/MVCExtensions.cs