Merge pull request #8 (thehyve) into rc2_dev

Conflicts:
	grails-app/services/SearchKeywordService.groovy