some bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/book.js
some bug fix