Merge branch 'develop' into master
Hotfix for ES search
Working on displaying tax count and ordering
Merge branch 'master' into develop
Working on generalizing genres, authors, tags, publishers, series into "Taxonomy"