Conflicts:
	src/org/thinker/common/AbstractDBUtil.java
	target/classes/org/thinker/common/AbstractDBUtil.class
	target/m2e-wtp/web-resources/META-INF/maven/book/book/pom.properties
Merge branch 'master' of https://github.com/acdc01421/bookProject

Conflicts:
	target/classes/.gitignore
	target/classes/org/thinker/common/AbstractDBUtil.class
	target/m2e-wtp/web-resources/META-INF/maven/book/book/pom.properties