Update
Small refactor
Merge branch 'master' of github.com:Dexels/navajo

Conflicts:
	server/com.dexels.navajo.entity.prototype/OSGI-INF/entity.xml
	server/com.dexels.navajo.entity/META-INF/MANIFEST.MF
	server/com.dexels.navajo.entity/OSGI-INF/entitymanager.xml
	server/com.dexels.navajo.entity/src/com/dexels/navajo/entity/Entity.java
	server/com.dexels.navajo.entity/src/com/dexels/navajo/entity/EntityComponent.java
	server/com.dexels.navajo.entity/src/com/dexels/navajo/entity/impl/ServiceEntityOperation.java