dwad
feafdMerge branch 'linder'

Conflicts:
	silence/silence/BulletKnuckles.cpp