Merge branch 'master' of https://github.com/caomu/slsc

Conflicts:
	pom.xml
	slsc-jar/pom.xml
	slsc-web/pom.xml
Merge branch 'master' of https://github.com/caomu/slsc

Conflicts:
	pom.xml
	slsc-jar/pom.xml
	slsc-web/pom.xml