dao and manager
remove conflect
Merge branch 'master' of https://github.com/maninsoft/skkupss.git

Conflicts:
	src/net/smartworks/skkupss/manager/impl/DbManagerImpl.java
	src/net/smartworks/skkupss/model/BizModelSpaceCond.java
	src/net/smartworks/skkupss/model/ProductServiceCond.java
	src/net/smartworks/skkupss/model/ServiceSpace.java
	src/net/smartworks/skkupss/model/ServiceSpaceCond.java
	src/net/smartworks/skkupss/model/ValueSpace.java
	src/net/smartworks/skkupss/model/ValueSpaceCond.java