search and filter related changes
Merge branch 'biodiv_usergroups' of github.com:strandls/biodiv into
biodiv_usergroups

Conflicts:
	grails-app/controllers/content/eml/DocumentController.groovy