small bugfixes
Merge branch 'master' into sigmaportal

Conflicts:
	web-client/src/main/resources/apps/js/GeoNetwork/lib/GeoNetwork/widgets/LoginForm.js
update keywordSearcher
adapted mail templates
bugfix in schematron rules for sigma
Merge branch 'master' into sigmaportal

Conflicts:
	schematrons/rules/schematron-rules-SIGMA.sch
	web/src/main/webResources/WEB-INF/applicationContext.xml
bugfixes
Changed label view metadata
Remove new metadata menu for registered users
Resolved thesaurus combobox bug
Only one google baselayer in use
contact us + bugfix zoom
Merge branch 'master' of https://github.com/VitoTAP/geonetwork.git
Merge branch 'master' into sigmaportal
Merge branch 'sigmaportal' of https://github.com/VitoTAP/geonetwork.git into sigmaportal

Conflicts:
	web/src/main/webResources/WEB-INF/applicationContext.xml