modificaciones generales
Merge branch 'master' of https://github.com/rojasmatias/Test

Conflicts:
	grails-app/controllers/search/SearchController.groovy