rebase url
Merge branch 'master' of github.com:Universiteitsbibliotheek/MeerCat

Conflicts:
	views/hits.tt
	views/index.tt
	views/longview.tt
	views/markview.tt
	views/saved_searches.tt
	views/shared/search_bar.tt
	views/shared/search_box.tt
	views/shared/user_info.tt