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

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	pom.xml
	target/maven-archiver/pom.properties