Updated and added Spring messages for jsp files in the webapp root folder
Merge branch 'master' of https://github.com/WISE-Community/WISE-Portal

- Merged/re-ordered some Spring messages