Fixing build
Merge branch 'refactor_search' of https://github.com/geonetwork/core-geonetwork into refactor_search
Merge branch 'refactor_search' of github.com:geonetwork/core-geonetwork into geocat_searchui_develop

Conflicts:
	pom.xml