jbl12-29 14：13
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/compiler.xml
	.idea/misc.xml
	bookManageSystem-business/bookManageSystem-business-anonymous/pom.xml
	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
	bookManageSystemWeb/src/main/webapp/js/config.js
	bookManageSystemWeb/src/main/webapp/portal.jsp
	bookManageSystemWeb/src/main/webapp/register.html
jbl12-29 15:46