结构修改
Merge branch 'master' of https://github.com/huizhazha/my-project.git

Conflicts:
	core/target/classes/META-INF/maven/org.my.project/core/pom.properties
	core/target/classes/META-INF/maven/org.my.project/core/pom.xml
	jsf-web/target/classes/applicationContext-jpa.xml
	jsf-web/target/classes/applicationContext.xml
	jsf-web/target/m2e-wtp/web-resources/META-INF/maven/org.my.project/jsf-web/pom.properties