Feature merge
Merge branch 'master' of git@github.com:Dexels/navajo.git

Conflicts:
	server/com.dexels.navajo.server.karaf.feature/build.xml