Signed-off-by: shadowedge <gulixing@msn.com>
Merge branch 'master' of https://github.com/shadowedge/keter-framework.git
Merge branch 'master' of
https://github.com/shadowedge/keter-framework.git

Conflicts:
	root/keter-service/src/main/resources/keter-service-config.xml

Signed-off-by: shadowedge <gulixing@msn.com>


Signed-off-by: shadowedge <gulixing@msn.com>