change silencer to do not disturb
change version code
Update settings text
Merge remote-tracking branch 'origin/master' into driving

Conflicts:
	TextSecretary/res/xml/preferences.xml