Merge branch 'virtual_collection_rework_interface_wip' of github.com:mikesname/docview into virtual_collection_rework_interface_wip

Conflicts:
	modules/core/app/assets/css/admin.less
	modules/core/app/assets/css/ehri/_search.less
	modules/portal/app/views/p/social/browseUsers.scala.html
Merge branch 'virtual_collection_rework_interface_wip' into merge_guides2

Conflicts:
	modules/core/app/assets/css/admin.less