Update dependencies for Non-OSGi. Not sure if it matters, but it seems cleaner than the way it was

Conflicts:

	server/com.dexels.navajo.server.deploy/build/regular/pom.xml
	server/com.dexels.navajo.server.deploy/build/sportlink/pom.xml
Fix problem with tomcat 7.0.52 and JSP EL properties
Fixes #227