no message
Merge branch 'Stage1' of https://github.com/acdana/ComS309Project into Stage1

Conflicts:
	src/main/java/META-INF/persistence.xml
	target/m2e-wtp/web-resources/META-INF/maven/com.cs309.team11/ComS309Project/pom.properties