Add book
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/pages/authors/add_author.jsp