Merge branch 'DEVELOP_FE' of ssh://git.eclipse.org:29418/elogbook/portalFE into DEVELOP_FE