Merge branch 'master' of https://github.com/Swifta/PSAWebPortal.git

Conflicts:
	WebContent/VAADIN/themes/mats_web_portal/mats_web_portal.scss
	src/com/swifta/mats/web/Login.java
	src/com/swifta/mats/web/MatsWebPortalUI.java
	src/com/swifta/mats/web/WorkSpace.java
After resolving conflicts
Merge branch 'master' of https://github.com/Swifta/PSAWebPortal.git
Merge branch 'master' of https://github.com/Swifta/PSAWebPortal.git
Brand new commit after a RESET was triggered
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git
into development