Revert "Revert "Merge branch 'master' of https://github.com/Norwegian-marine-datacentre/mareano""

This reverts commit f2158a06828ea146f399aff119080ee9e22481b0.

Conflicts:
	src/main/webapp/WEB-INF/jsp/mareano.jsp
	src/main/webapp/WEB-INF/jsp/mareano_en.jsp