cam fix
Merge branch 'Jimmy'
Merge branch 'sean'

Conflicts:
	silence/silence/Entity.cpp