Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3

Conflicts:
	CHANGELOG.md
	README.md
	art/render.rb
	build.gradle
	src/main/java/eu/siacs/conversations/Config.java
	src/main/java/eu/siacs/conversations/crypto/OtrService.java
	src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
	src/main/java/eu/siacs/conversations/entities/Account.java
	src/main/java/eu/siacs/conversations/entities/Contact.java
	src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
	src/main/java/eu/siacs/conversations/entities/Message.java
	src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
	src/main/java/eu/siacs/conversations/generator/IqGenerator.java
	src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
	src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
	src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
	src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
	src/main/java/eu/siacs/conversations/parser/AbstractParser.java
	src/main/java/eu/siacs/conversations/parser/MessageParser.java
	src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
	src/main/java/eu/siacs/conversations/persistance/FileBackend.java
	src/main/java/eu/siacs/conversations/services/NotificationService.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
	src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
	src/main/java/eu/siacs/conversations/utils/DNSHelper.java
	src/main/java/eu/siacs/conversations/utils/MimeUtils.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
	src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
	src/main/res/layout/account_row.xml
	src/main/res/layout/activity_edit_account.xml
	src/main/res/layout/activity_muc_details.xml
	src/main/res/layout/contact.xml
	src/main/res/layout/contact_key.xml
	src/main/res/layout/conversation_list_row.xml
	src/main/res/layout/fragment_conversation.xml
	src/main/res/layout/message_received.xml
	src/main/res/layout/message_sent.xml
	src/main/res/values-bg/strings.xml
	src/main/res/values-ca/strings.xml
	src/main/res/values-cs/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-el/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-id/strings.xml
	src/main/res/values-it/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-ko/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pl/strings.xml
	src/main/res/values-pt/strings.xml
	src/main/res/values-ru/strings.xml
	src/main/res/values-sk/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-sv/strings.xml
	src/main/res/values-v21/themes.xml
	src/main/res/values-zh-rCN/strings.xml
	src/main/res/values/arrays.xml
	src/main/res/values/colors.xml
	src/main/res/values/dimens.xml
	src/main/res/values/strings.xml
	src/main/res/xml/preferences.xml

1 files changed, 10 insertions, 9 deletions

diff --git a/README.md b/README.md
index 9e7ffd2f..a68b162b 100644
--- a/README.md
+++ b/README.md
@@ -39,24 +39,24 @@ support these extensions; therefore to get the most out of Conversations you
 should consider either switching to an XMPP server that does or — even better —
 run your own XMPP server for you and your friends. These XEP's are:
 
-* XEP-0065: SOCKS5 Bytestreams (or mod_proxy65). Will be used to transfer
+* [XEP-0065: SOCKS5 Bytestreams](http://xmpp.org/extensions/xep-0065.html) (or mod_proxy65). Will be used to transfer
   files if both parties are behind a firewall (NAT).
-* XEP-0163: Personal Eventing Protocol for avatars
-* XEP-0191: Blocking command lets you blacklist spammers or block contacts
+* [XEP-0163: Personal Eventing Protocol](http://xmpp.org/extensions/xep-0163.html) for avatars
+* [XEP-0191: Blocking command](http://xmpp.org/extensions/xep-0191.html) lets you blacklist spammers or block contacts
   without removing them from your roster.
-* XEP-0198: Stream Management allows XMPP to survive small network outages and
+* [XEP-0198: Stream Management](http://xmpp.org/extensions/xep-0198.html) allows XMPP to survive small network outages and
   changes of the underlying TCP connection.
-* XEP-0280: Message Carbons which automatically syncs the messages you send to
+* [XEP-0280: Message Carbons](http://xmpp.org/extensions/xep-0280.html) which automatically syncs the messages you send to
   your desktop client and thus allows you to switch seamlessly from your mobile
   client to your desktop client and back within one conversation.
-* XEP-0237: Roster Versioning mainly to save bandwidth on poor mobile connections
-* XEP-0313: Message Archive Management synchronize message history with the
+* [XEP-0237: Roster Versioning](http://xmpp.org/extensions/xep-0237.html) mainly to save bandwidth on poor mobile connections
+* [XEP-0313: Message Archive Management](http://xmpp.org/extensions/xep-0313.html) synchronize message history with the
   server. Catch up with messages that were sent while Conversations was
   offline.
-* XEP-0352: Client State Indication lets the server know whether or not
+* [XEP-0352: Client State Indication](http://xmpp.org/extensions/xep-0352.html) lets the server know whether or not
   Conversations is in the background. Allows the server to save bandwidth by
   withholding unimportant packages.
-* XEP-xxxx: HttpUpload allows you to share files in conferences and with offline
+* [XEP-xxxx: HTTP File Upload](http://xmpp.org/extensions/inbox/http-upload.html) allows you to share files in conferences and with offline
   contacts. Requires an [additional component](https://github.com/siacs/HttpUploadComponent)
   on your server.
 
@@ -81,6 +81,7 @@ run your own XMPP server for you and your friends. These XEP's are:
 #### Logo
 * [Ilia Rostovtsev](https://github.com/qooob) (Progress)
 * [Diego Turtulici](http://efesto.eigenlab.org/~diesys) (Original)
+* [fiaxh](https://github.com/fiaxh) (OMEMO)
 
 #### Translations
 Translations are managed on [Transifex](https://www.transifex.com/projects/p/conversations/)