up
Merge branch 'master' of https://github.com/huangshanqi/BookManage

Conflicts:
	src/com/hsq/controller/BookController.java
	src/com/hsq/mapper/BookDaoMapper.xml