Tidy up
Merge branch 'master' into complex-jsp

Conflicts:
	pom.xml
Tidied up jsp-complex-jdbc