Fixed the geonetwork configuration
More fixes for the geonetwork template
Merge with master