King12-29 16:36
Merge remote-tracking branch 'origin/master'

Conflicts:
	bookManageSystemWeb/src/main/webapp/WEB-INF/lib/bookManageSystem-business-anonymous-1.0-SNAPSHOT.jar
	bookManageSystemWeb/src/main/webapp/WEB-INF/lib/bookManageSystem-fundamental-config-1.0-SNAPSHOT.jar
	bookManageSystemWeb/src/main/webapp/WEB-INF/lib/bookManageSystem-fundamental-datasource-1.0-SNAPSHOT.jar
	bookManageSystemWeb/src/main/webapp/WEB-INF/lib/bookManageSystem-fundamental-exception-1.0-SNAPSHOT.jar
	bookManageSystemWeb/src/main/webapp/WEB-INF/lib/bookManageSystem-fundamental-logger-1.0-SNAPSHOT.jar
	bookManageSystemWeb/src/main/webapp/WEB-INF/lib/bookManageSystem-fundamental-orm-1.0-SNAPSHOT.jar
	bookManageSystemWeb/src/main/webapp/WEB-INF/lib/bookManageSystem-fundamental-security-1.0-SNAPSHOT.jar
	bookManageSystemWeb/src/main/webapp/WEB-INF/lib/bookManageSystem-fundamental-util-1.0-SNAPSHOT.jar
King12-29 17:19