index into es
Merge branch 'master' of https://github.com/Universiteitsbibliotheek/MeerCat

Conflicts:
	catmandu.yml
query from es
Merge branch 'master' of https://github.com/Universiteitsbibliotheek/MeerCat
remove references to solr