Merge branch 'master' into sportlink

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

Conflicts:
	server/com.dexels.navajo.server.deploy/pom.xml