Clean resource based navajo adapters dependencies
Start on multi-context navajo
Merge branch 'master' into sportlink

Conflicts:
	server/com.dexels.navajo.server.deploy/pom.xml
	server/com.dexels.navajo.server.deploy/sample/Server/tml/writeversion.jsp