Catalog is not ready for PressBooks.com
Merge branch 'dev' into hotfix
Merge branch 'dev' into hotfix
Fix for Ticket 846
Merge branch 'dev'

Conflicts:
	hooks-admin.php
Clear the cache when updating book cover.
Merge branch 'dev'