Connection throw Tomcat.
Last save before JSTL -> JSP ( so we can return to JSTL)
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/src/main/resources/library-context.xml