Fix a git mess up
Merge branch 'master' into multitenant

Conflicts:
	server/com.dexels.navajo.entity/src/com/dexels/navajo/entity/adapters/EntityMap.java
	server/com.dexels.navajo.entity/src/com/dexels/navajo/entity/listener/EntityListener.java