asd
Merge branch 'sean'

Conflicts:
	silence/silence/Kriminel.cpp