Merge branch 'master' of github.com:qriver/Delphi2010

Conflicts:
	SystemManager/TableDefineUnit/uTableAdd.dfm
	SystemManager/TableDefineUnit/uTableAdd.pas
	SystemManager/TableDefineUnit/uTableDefine.pas
	SystemManager/bin/Data/DbLink.udl
	SystemManager/bin/Reg.xml
Merge branch 'master' of github.com:qriver/Delphi2010

Conflicts:
	SystemManager/TableDefineUnit/uTableAdd.dfm
	SystemManager/TableDefineUnit/uTableAdd.pas
	SystemManager/TableDefineUnit/uTableDefine.pas
	SystemManager/bin/Reg.xml