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

Conflicts:
	src/net/smartworks/server/engine/process/script/function/SctXPathFunction.java
report