update search to return json response
Merge branch 'master' of https://github.com/dpilipenko/one-map

Conflicts:
	one-map/grails-app/domain/com/rosetta/onemap/pintypes/Room.groovy