Indexering objectencataloog
Removed a subtemplate copied to templates folder by mistake, the right version still in subtemplates folder
Resolved mantis 2407, 2412, 2420
Merge branch 'master' of https://github.com/GDI-Vlaanderen/geonetwork.git
Resolved Conflicts:
web-client/src/main/resources/apps/tabsearch/js/Settings.js