asdas
asdMerge branch 'sean'

Conflicts:
	silence/silence/silence.vcxproj.filters
Merge branch 'Jimmy'