commit
Merge branch 'master' of https://github.com/maninsoft/smartworksV3.git
commit
com
Merge branch 'master' of https://github.com/maninsoft/smartworksV3.git

Conflicts:
	src/net/smartworks/server/service/impl/InstanceServiceImpl.java
	src/net/smartworks/server/service/util/ModelConverter.java