combination UI create!
create insert combination bug fixed!!!!
master detail table bug fixed!!
Merge branch 'master' of https://github.com/CODINGVOICE/DMS

Conflicts:
	Model/src/team/epm/module/DcmModule.xml
	Model/src/team/epm/module/DcmModuleImpl.java
	Model/src/team/epm/module/DmsModuleImpl.java
	View/View.jpr
	View/adfmsrc/DataBindings.cpx
	View/src/dms_v.properties
routine commit!
routine commit!!
template column basic frame done!
coulnm Chinesize!
routine commit!
routine commit
routine commit
routine commit
commit