created sportlink branch (without slf4j)
Merge branch 'master' into sportlink
Merge branch 'master' into sportlink

Conflicts:
	server/com.dexels.navajo.server.deploy/pom.xml
sportlink version
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
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
	server/com.dexels.navajo.server.deploy/sample/Server/tml/writeversion.jsp
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
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/pom.xml
Merge branch 'master' into sportlink

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

Conflicts:
	server/com.dexels.navajo.server.deploy/sample/Server/tml/writeversion.jsp
Merge branch 'sportlink' of github.com:Dexels/navajo into sportlink
Merge branch 'master' into sportlink
Merge branch 'master' into sportlink
update
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
	server/com.dexels.navajo.server.deploy/sample/Server/tml/writeversion.jsp