Hack around document['@id'] translation trouble
Persistent search queries, first attempt
Merge branch 'develop' of https://github.com/libris/kitin into develop

Conflicts:
	templates/_media.html
Search view persistent