Merge branch 'collections_browse'

Conflicts:
	CollectionTreePlugin.php
	views/admin/plugins/collection-tree-config-form.php