ireadery
Merge branch 'master' of https://github.com/pymmrd/ireader

Conflicts:
	ireader/book/handlers.py
	ireader/book/utils.py
	ireader/templates/book/category.html