Merge branch 'hotfix'
Change id by category field in list
Merge branch 'change-book-list-layout' into develop