aaaa
Merge branch 'master' of https://github.com/acdc01421/bookProject

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/book/book/pom.properties