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

Conflicts:
	src/com/swifta/mats/web/usermanagement/BackEndEmulator.java
	src/com/swifta/mats/web/usermanagement/BtnOpClickListener.java
	src/com/swifta/mats/web/usermanagement/UserDetailsModule.java
Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git
into development