Indexering objectencataloog
Removed a subtemplate copied to templates folder by mistake, the right version still in subtemplates folder
Resolved mantis 2407, 2412, 2420
Indexing now in same thread as request thread avoiding lock on database
Moving GA script from index pages to settings.js
Modified main pom to simplify build
Merge branch 'master' into without-security

Resloved conflicts:	web-client/src/main/resources/apps/tabsearch/js/Settings.js
Merge branch 'without-security' of https://github.com/GDI-Vlaanderen/geonetwork.git into without-security

Resolved conflicts: jeeves/src/main/java/jeeves/server/sources/http/JeevesServlet.java