Clean up and refactor some backend methods. Remove superfluous bool returns from delete methods
Merge branch 'master' into virtual_collection_rework
Move around bookmark-related templates
Tweak the way we render facet class labels w/messages and add tooltips. Fixes #370
Merge branch 'master' into virtual_collection_rework

Conflicts:
	modules/portal/conf/messages
Merge branch 'virtual_collection_rework' into merge_guides2
Merge branch 'new-guides-clean-merge' of https://github.com/PonteIneptique/docview into merge_guides2
Merge branch 'new-guides-clean-merge' of https://github.com/PonteIneptique/docview into merge_guides2
Merge remote-tracking branch 'upstream/merge_guides2' into new-guides-clean-merge