Merge update
Merge remote-tracking branch 'origin/return' into return

Conflicts:
	Agile/src/main/java/hei/agile/entity/Borrow.java
	Agile/src/main/java/hei/agile/service/impl/BorrowServiceImpl.java
	Agile/src/main/webapp/WEB-INF/pages/borrow/ReturnBookForm.jsp