update sdklib
update contract
update dircenter
add copyright
update contract
update tuborials
update contractt sql
update contractt sql
update mysql
update koudai
Merge remote-tracking branch 'upstream/master'

Conflicts:
	SDK/Source/ScutSDK/ScutDataLogic/DataHandler.cpp
	SDK/Source/ScutSDK/ScutDataLogic/DataHandler.h
	SDK/Source/ScutSDK/ScutDataLogic/DataRequest.cpp
	SDK/Source/ScutSDK/ScutDataLogic/DataRequest.h
	SDK/Source/ScutSDK/ScutDataLogic/FileHelper.cpp
	SDK/Source/ScutSDK/ScutDataLogic/FileHelper.h
	SDK/Source/ScutSDK/ScutDataLogic/IPluginInfo.cpp
	SDK/Source/ScutSDK/ScutDataLogic/IPluginInfo.h
	SDK/Source/ScutSDK/ScutDataLogic/Int64.cpp
	SDK/Source/ScutSDK/ScutDataLogic/Int64.h
	SDK/Source/ScutSDK/ScutDataLogic/LUA_Export/DataRequest.pkg
	SDK/Source/ScutSDK/ScutDataLogic/LUA_Export/FileHelper.pkg
	SDK/Source/ScutSDK/ScutDataLogic/LUA_Export/LuaScutDataLogic.cpp
	SDK/Source/ScutSDK/ScutDataLogic/LUA_Export/LuaString.pkg
	SDK/Source/ScutSDK/ScutDataLogic/LUA_Export/NetHelper.pkg
	SDK/Source/ScutSDK/ScutDataLogic/LUA_Export/NetStreamExport.pkg
	SDK/Source/ScutSDK/ScutDataLogic/LUA_Export/ScutDataLogic.pkg
	SDK/Source/ScutSDK/ScutDataLogic/LUA_Export/lua.txt
	SDK/Source/ScutSDK/ScutDataLogic/LuaHost.cpp
	SDK/Source/ScutSDK/ScutDataLogic/LuaHost.h
	SDK/Source/ScutSDK/ScutDataLogic/LuaIni.cpp
	SDK/Source/ScutSDK/ScutDataLogic/LuaIni.h
	SDK/Source/ScutSDK/ScutDataLogic/LuaString.h
	SDK/Source/ScutSDK/ScutDataLogic/Makefile.ARM
	SDK/Source/ScutSDK/ScutDataLogic/NetHelper.cpp
	SDK/Source/ScutSDK/ScutDataLogic/NetHelper.h
	SDK/Source/ScutSDK/ScutDataLogic/NetStreamExport.cpp
	SDK/Source/ScutSDK/ScutDataLogic/NetStreamExport.h
	SDK/Source/ScutSDK/ScutDataLogic/PackageUnzipHandler.cpp
	SDK/Source/ScutSDK/ScutDataLogic/PackageUnzipHandler.h
	SDK/Source/ScutSDK/ScutDataLogic/Utility.cpp
	SDK/Source/ScutSDK/ScutDataLogic/Utility.h
	SDK/Source/ScutSDK/ScutDataLogic/XmlDataHandler.cpp
	SDK/Source/ScutSDK/ScutDataLogic/XmlDataHandler.h
	SDK/Source/ScutSDK/ScutDataLogic/iniEx.cpp
	SDK/Source/ScutSDK/ScutDataLogic/iniEx.h
	SDK/Source/ScutSDK/ScutDataLogic/jni/Android.mk
	SDK/Source/ScutSDK/ScutDataLogic/jni/Application.mk
	SDK/Source/ScutSDK/ScutDataLogic/stdafx.cpp
	SDK/Source/ScutSDK/ScutDataLogic/stdafx.h
	SDK/Source/ScutSDK/ScutDataLogic/targetver.h
	SDK/Source/ScutSDK/ScutDataLogic/zip_support/ZipUtils.cpp
	SDK/Source/ScutSDK/ScutDataLogic/zip_support/ZipUtils.h
	SDK/Source/ScutSDK/ScutNetwork/HttpClient.cpp
	SDK/Source/ScutSDK/ScutNetwork/HttpClientRequest.cpp
	SDK/Source/ScutSDK/ScutNetwork/HttpClientRequest.h
	SDK/Source/ScutSDK/ScutNetwork/INetStatusNotify.h
	SDK/Source/ScutSDK/ScutNetwork/LUA_Export/HttpClient.pkg
	SDK/Source/ScutSDK/ScutNetwork/LUA_Export/HttpClientResponse.pkg
	SDK/Source/ScutSDK/ScutNetwork/LUA_Export/HttpSession.pkg
	SDK/Source/ScutSDK/ScutNetwork/LUA_Export/LuaScutNetwork.cpp
	SDK/Source/ScutSDK/ScutNetwork/LUA_Export/ScutNetwork.pkg
	SDK/Source/ScutSDK/ScutNetwork/LUA_Export/TcpClient.pkg
	SDK/Source/ScutSDK/ScutNetwork/LUA_Export/lua.txt
	SDK/Source/ScutSDK/ScutNetwork/LuaHelper.cpp
	SDK/Source/ScutSDK/ScutNetwork/LuaHelper.h
	SDK/Source/ScutSDK/ScutNetwork/Makefile.ARM
	SDK/Source/ScutSDK/ScutNetwork/NdNetwork_Arm.TMK3
	SDK/Source/ScutSDK/ScutNetwork/NetClientBase.cpp
	SDK/Source/ScutSDK/ScutNetwork/TcpClient.cpp
	SDK/Source/ScutSDK/ScutNetwork/TcpClient.h
	SDK/Source/ScutSDK/ScutNetwork/TcpSceneManager.cpp
	SDK/Source/ScutSDK/ScutNetwork/TcpSceneManager.h
	SDK/Source/ScutSDK/ScutNetwork/ZipUtils.cpp
	SDK/Source/ScutSDK/ScutNetwork/ZipUtils.h
	SDK/Source/ScutSDK/ScutNetwork/jni/Android.mk
	SDK/Source/ScutSDK/ScutNetwork/jni/Application.mk
	SDK/Source/ScutSDK/ScutNetwork/stdafx.cpp
	SDK/Source/ScutSDK/ScutNetwork/stdafx.h
	SDK/Source/ScutSDK/ScutNetwork/targetver.h
	SDK/Source/ScutSDK/ScutSystem/AutoGuard.cpp
	SDK/Source/ScutSDK/ScutSystem/AutoGuard.h
	SDK/Source/ScutSDK/ScutSystem/Des91Priv.cpp
	SDK/Source/ScutSDK/ScutSystem/LUA_Export/LuaScutSystem.cpp
	SDK/Source/ScutSDK/ScutSystem/LUA_Export/ScutSMS.pkg
	SDK/Source/ScutSDK/ScutSystem/LUA_Export/ScutSystem.pkg
	SDK/Source/ScutSDK/ScutSystem/LUA_Export/ScutUtility.pkg
	SDK/Source/ScutSDK/ScutSystem/LUA_Export/Stream.pkg
	SDK/Source/ScutSDK/ScutSystem/LUA_Export/lua.txt
	SDK/Source/ScutSDK/ScutSystem/LUA_Export/md5.pkg
	SDK/Source/ScutSDK/ScutSystem/Makefile.ARM
	SDK/Source/ScutSDK/ScutSystem/Markup/Markup.cpp
	SDK/Source/ScutSDK/ScutSystem/Markup/Markup.h
	SDK/Source/ScutSDK/ScutSystem/PathUtility.cpp
	SDK/Source/ScutSDK/ScutSystem/PathUtility.h
	SDK/Source/ScutSDK/ScutSystem/ScutSMS.cpp
	SDK/Source/ScutSDK/ScutSystem/ScutSMS.h
	SDK/Source/ScutSDK/ScutSystem/ScutUtility.cpp
	SDK/Source/ScutSDK/ScutSystem/ScutUtility.h
	SDK/Source/ScutSDK/ScutSystem/StdDES2.cpp
	SDK/Source/ScutSDK/ScutSystem/StdDES2.h
	SDK/Source/ScutSDK/ScutSystem/Stream.cpp
	SDK/Source/ScutSDK/ScutSystem/Stream.h
	SDK/Source/ScutSDK/ScutSystem/Trace.cpp
	SDK/Source/ScutSDK/ScutSystem/WjcDes.cpp
	SDK/Source/ScutSDK/ScutSystem/WjcDes.h
	SDK/Source/ScutSDK/ScutSystem/ZipUnZip.cpp
	SDK/Source/ScutSDK/ScutSystem/ZipUnZip.h
	SDK/Source/ScutSDK/ScutSystem/android/ScutSmsUtilsjni.cpp
	SDK/Source/ScutSDK/ScutSystem/android/ScutSmsUtilsjni.h
	SDK/Source/ScutSDK/ScutSystem/android/SmsUtils.java
	SDK/Source/ScutSDK/ScutSystem/global.h
	SDK/Source/ScutSDK/ScutSystem/jni/Android.mk
	SDK/Source/ScutSDK/ScutSystem/jni/Application.mk
	SDK/Source/ScutSDK/ScutSystem/md5.cpp
	SDK/Source/ScutSDK/ScutSystem/md5.h
	SDK/Source/ScutSDK/ScutSystem/stdafx.cpp
	SDK/Source/ScutSDK/ScutSystem/stdafx.h
	SDK/Source/ScutSDK/ScutSystem/targetver.h
	SDK/Source/ScutSDK/ScutSystem/tchar.h
	SDK/Source/ScutSDK/ScutSystem/unzip.cpp
	SDK/Source/ScutSDK/ScutSystem/unzip.h
	SDK/Source/ScutSDK/ScutUtility/LUA_Export/LuaScutUtility.cpp
	SDK/Source/ScutSDK/ScutUtility/LUA_Export/ScutLanFactory.pkg
	SDK/Source/ScutSDK/ScutUtility/LUA_Export/ScutLocale.pkg
	SDK/Source/ScutSDK/ScutUtility/LUA_Export/ScutLuaLan.pkg
	SDK/Source/ScutSDK/ScutUtility/LUA_Export/ScutUtility.pkg
	SDK/Source/ScutSDK/ScutUtility/LUA_Export/ScutUtils.pkg
	SDK/Source/ScutSDK/ScutUtility/LUA_Export/lua.txt
	SDK/Source/ScutSDK/ScutUtility/PlatformProcedure.cpp
	SDK/Source/ScutSDK/ScutUtility/PlatformProcedure.h
	SDK/Source/ScutSDK/ScutUtility/ScutLanFactory.cpp
	SDK/Source/ScutSDK/ScutUtility/ScutLanFactory.h
	SDK/Source/ScutSDK/ScutUtility/ScutLocale.cpp
	SDK/Source/ScutSDK/ScutUtility/ScutLocale.h
	SDK/Source/ScutSDK/ScutUtility/ScutLuaLan.cpp
	SDK/Source/ScutSDK/ScutUtility/ScutLuaLan.h
	SDK/Source/ScutSDK/ScutUtility/ScutUtils.cpp
	SDK/Source/ScutSDK/ScutUtility/ScutUtils.h
	SDK/Source/ScutSDK/ScutUtility/android/NdUtilityJni.java
	SDK/Source/ScutSDK/ScutUtility/android/ScutUtilityJni.cpp
	SDK/Source/ScutSDK/ScutUtility/android/ScutUtilityJni.h
	SDK/Source/ScutSDK/ScutUtility/android/jni/Android.mk
	SDK/Source/ScutSDK/ScutUtility/android/jni/Application.mk
	SDK/Source/ScutSDK/ScutUtility/android/使用说明.txt
	SDK/Source/ScutSDK/ScutUtility/iphone/IphoneInterface.h
	SDK/Source/ScutSDK/ScutUtility/iphone/IphoneInterface.mm
	Source/DirCenter/src/ZyGames.DirCenter/Model/ComboData.cs
	Source/DirCenter/src/ZyGames.DirCenter/Service.aspx.designer.cs
	Source/Tools/ContractTools/ContractTools.WebApp/ContractTools.WebApp.csproj
	Source/Tools/ContractTools/release/index.aspx
	Source/Tools/ContractTools/src/ContractTools.WebApp/Base/DbDataLoader.cs
	Source/Tools/ContractTools/src/ContractTools.WebApp/Base/JsonProperty.cs
	Source/Tools/ContractTools/src/ContractTools.WebApp/Base/TemplateHelper.cs
	Source/Tools/ContractTools/src/ContractTools.WebApp/Model/ContractModel.cs
	Source/Tools/ContractTools/src/ContractTools.WebApp/Properties/AssemblyInfo.cs
	Source/Tools/ContractTools/src/ContractTools.WebApp/index.aspx.cs
	Source/Tools/ContractTools/src/ContractTools.WebApp/index.aspx.designer.cs