Adding multi instance
whoops
Merge branch 'master' of github.com:Dexels/navajo

Conflicts:
	server/com.dexels.navajo.server.bridged/NavajoSportlink.launch
added multi tenancy for vaadin/tipi
switch to repo.dexels.com
clean imports
clean warnings