Merge branch 'master' of https://github.com/leocss/elibrary-web

Conflicts:
	app/views/book/category.twig
	app/views/book/index.twig
	assets/css/modules/books.css