Merging layout changes from master to maven branch
Merge branch 'maven' of https://github.com/eea/eea.climateadapt into maven