Merge branch 'master' into sportlink

Conflicts:
	server/com.dexels.navajo.server.deploy/pom.xml
upgraded adapters.
upgrade
Merge branch 'sportlink' of github.com:Dexels/navajo into sportlink

Conflicts:
	server/com.dexels.navajo.server.deploy/pom.xml
Merge branch 'master' into sportlink
fix
Re-enabled dummy tribe manager
Merge branch 'sportlink' of github.com:Dexels/navajo into sportlink

Conflicts:
	server/com.dexels.navajo.server.deploy/pom.xml
Merge branch 'master' into sportlink

Conflicts:
	core/com.dexels.navajo.core/OSGI-INF/dummyTribeManager.xml
Merge branch 'sportlink' of github.com:Dexels/navajo into sportlink
Merge branch 'master' into sportlink

Conflicts:
	core/com.dexels.navajo.core/OSGI-INF/dummyTribeManager.xml
	server/com.dexels.navajo.server.deploy/pom.xml
Merge branch 'sportlink' of github.com:Dexels/navajo into sportlink
Merge branch 'master' into sportlink
Merge branch 'master' into sportlink
Merge branch 'master' into sportlink
Merge branch 'master' into sportlink
Merge branch 'master' into sportlink
Merge branch 'master' into sportlink

Conflicts:
	server/com.dexels.navajo.server.deploy/pom.xml
Merge branch 'master' into sportlink

Conflicts:
	server/com.dexels.navajo.server.deploy/pom.xml
Merge branch 'master' into sportlink

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