update
Update
Small refactor
Merge branch 'master' into multitenant

Conflicts:
	server/com.dexels.navajo.server.bridged/NavajoSportlink_article.launch