started books
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/pages/books/manage_books.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/pages/books/manage_books.jsp
Merge remote-tracking branch 'origin/master'