Conflicts:
	res/values-ru/preference_editor.xml
	res/values/preference_editor.xml
	res/values/preferences.xml
	res/xml/preference_editor.xml
	src/com/xabber/android/data/SettingsManager.java
	src/com/xabber/android/data/message/AbstractChat.java
	src/com/xabber/android/data/message/MessageManager.java