edit catalog
addBook
admin page
edit catalog page
Merge branch 'testBranch'

Conflicts:
	core/bookStore/bs-dao/src/main/java/pro/redsoft/bean/Author.java
	core/bookStore/bs-dao/src/main/java/pro/redsoft/bean/Book.java
	core/bookStore/bs-dao/src/main/java/pro/redsoft/bean/Category.java
	core/bookStore/bs-dao/src/main/java/pro/redsoft/bean/Publisher.java
	core/bookStore/bs-dao/src/main/java/pro/redsoft/bean/User.java
	core/bookStore/bs-dao/src/main/java/pro/redsoft/dao/IDao.java
	core/bookStore/bs-dao/src/main/java/pro/redsoft/dao/IDaoImpl.java
	core/bookStore/bs-service/src/main/java/pro/redsoft/service/IService.java
	core/bookStore/bs-service/src/main/java/pro/redsoft/service/IServiceImpl.java
	core/bookStore/bs-web/src/main/java/pro/redsoft/controller/MainController.java
	core/bookStore/bs-web/src/main/webapp/WEB-INF/layout/content/home.jsp
	core/bookStore/bs-web/src/main/webapp/WEB-INF/templates.xml