entity storage fixes
Merge branch 'master' of https://code.google.com/p/bugengine

Conflicts:
	src/engine/world/src/entitystorage.cc