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
Table has been created for the Account Management
Brand new commit after a RESET was triggered
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git
into development
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git into development
Create account form has been added
Add All Add New(All User Types).
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

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
Add New account added
Bulk Import added
Jar file has been added to project. Please copy the jar file
(opencsv-2.2.jar) into Apache server lib if you get runtime errors
Updated jar
added jar to the project
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git into development