New landing page, but broken layout for 2nd...
Merge branch 'master' of https://github.com/Kombicorp/marePortal

Conflicts:
	config/locales/en.json