now we use entity manager
Merge branch 'Jimmy'

Conflicts:
	silence/silence/EntityManager.cpp