more refactoring #56 and fix for search
Merge branch 'master' of https://github.com/OnroerendErfgoed/atramhasis

Conflicts:
	atramhasis/views/views.py