entitymanager collision
Merge branch 'Jimmy'
hej filer ID
map
Merge branch 'sebastian'
resolve collision entities..
Merge branch 'Jimmy'

Conflicts:
	silence/silence/Entity.cpp
	silence/silence/EntityManager.cpp
hej allihopapa nu nfunkar collision p� wep
Merge branch 'sean'
hey mister DJ, i know what i want