after adding new jars to the correct classpath
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:
	.classpath