map
Merge branch 'sebastian'
resolve collision entities..
Merge branch 'Jimmy'

Conflicts:
	silence/silence/Entity.cpp
	silence/silence/EntityManager.cpp
Merge branch 'sean'