fix for error messages, updates for reset password, removed link to register
Merge branch 'master' of https://github.com/Kombicorp/marePortal