Merge tag '0.9.30f' into develop

0.9.30f

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values-fr/contact_viewer.xml
	app/src/main/res/values-fr/phrase_editor.xml
	app/src/main/res/values-sv-rSE/about_viewer.xml
	app/src/main/res/values-sv-rSE/account_editor.xml
	app/src/main/res/values-sv-rSE/account_list.xml
	app/src/main/res/values-sv-rSE/chat_viewer.xml
	app/src/main/res/values-sv-rSE/contact_editor.xml
	app/src/main/res/values-sv-rSE/contact_list.xml
	app/src/main/res/values-sv-rSE/contact_viewer.xml
	app/src/main/res/values-sv-rSE/fingerprint_viewer.xml
	app/src/main/res/values-sv-rSE/market.xml
	app/src/main/res/values-sv-rSE/muc_editor.xml
	app/src/main/res/values-sv-rSE/notification_bar.xml
	app/src/main/res/values-sv-rSE/phrase_editor.xml
	app/src/main/res/values-sv-rSE/preference_editor.xml
	app/src/main/res/values-sv-rSE/secret_viewer.xml
	app/src/main/res/values-sv-rSE/status_editor.xml
	app/src/main/res/values-sv-rSE/words.xml
	app/src/main/res/values-tr/account_editor.xml
	app/src/main/res/values-tr/chat_viewer.xml
	app/src/main/res/values-tr/contact_list.xml
	app/src/main/res/values-tr/contact_viewer.xml
	app/src/main/res/values-tr/fingerprint_viewer.xml
	app/src/main/res/values-tr/market.xml
	app/src/main/res/values-tr/muc_editor.xml
	app/src/main/res/values-tr/notification_bar.xml
	app/src/main/res/values-tr/phrase_editor.xml
	app/src/main/res/values-tr/preference_editor.xml
	app/src/main/res/values-tr/status_editor.xml
	app/src/main/res/values-tr/words.xml
	app/src/main/res/values/versions.xml