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

Conflicts:
	src/com/swifta/mats/web/utils/UserManagementService.java
registerProfile() changed to registerUser() in UserManagementService
registerUser and activateUser have been optimized
registration and activation added and optimized
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git into development