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

Conflicts:
	.classpath
	.mymetadata
	.project
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebRoot/WEB-INF/web.xml
	config/im/shs/config/spring/applicationContext-mvc.xml
	pom.xml
	service/im/shs/action/IndexController.java
	target/SHS-0.0.1-SNAPSHOT.war
	target/m2e-jee/web-resources/META-INF/MANIFEST.MF
	target/m2e-jee/web-resources/META-INF/maven/SHS/SHS/pom.properties
	target/m2e-jee/web-resources/META-INF/maven/SHS/SHS/pom.xml
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	target/maven-archiver/pom.properties