Quick fix
Merge branch 'admin-dashboard' of https://github.com/peerlibrary/peerlibrary into admin-dashboard

Conflicts:
	client/templates/catalog.html
Quick fix