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

Conflicts:
	src/com/swifta/mats/web/usermanagement/BtnTabLikeClickListener.java
	src/com/swifta/mats/web/usermanagement/ManageUserModule.java
	src/com/swifta/mats/web/usermanagement/SearchUserModule.java
	src/com/swifta/mats/web/usermanagement/UserDetailsModule.java
	src/com/swifta/mats/web/usermanagement/WorkSpaceManageUser.java
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git
into development

Conflicts:
	WebContent/VAADIN/themes/mats_web_portal/mats_web_portal.scss
	src/com/swifta/mats/web/usermanagement/BtnTabLikeClickListener.java
	src/com/swifta/mats/web/usermanagement/ManageUserModule.java
	src/com/swifta/mats/web/usermanagement/WorkSpaceManageUser.java
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git
into development