code clean
fix logging
Merge branch 'master' of github.com:Dexels/navajo

Conflicts:
	tipi/com.dexels.navajo.tipi/src/com/dexels/navajo/tipi/TipiContext.java