book with genre list
Merge remote-tracking branch 'origin/master'
rename
bookdao
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/getjavajobs/library/services/AuthorService.java
...