prepare to pull ada search
Merge branch 'master' of https://github.com/plutoattack/Prisma

Conflicts:
	grails-app/controllers/prisma/SearchController.groovy
added specific and general search