change
change
Merge branch 'master' of github.com:MiniApp/SHS

Conflicts:
	.settings/org.eclipse.wst.common.component
	config/im/shs/config/spring/applicationContext-beans.xml