Merge branch 'gradle' into development

Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib

28 files changed, 0 insertions, 0 deletions

diff --git a/res/layout-w360dp/fragment_conversations_overview.xml b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
index a600118d..a600118d 100644
--- a/res/layout-w360dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
diff --git a/res/layout-w384dp/fragment_conversations_overview.xml b/src/main/res/layout-w384dp/fragment_conversations_overview.xml
index c3aa67ae..c3aa67ae 100644
--- a/res/layout-w384dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w384dp/fragment_conversations_overview.xml
diff --git a/res/layout-w600dp/fragment_conversations_overview.xml b/src/main/res/layout-w600dp/fragment_conversations_overview.xml
index 331fb1f0..331fb1f0 100644
--- a/res/layout-w600dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w600dp/fragment_conversations_overview.xml
diff --git a/res/layout-w960dp/fragment_conversations_overview.xml b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
index 2744f38e..2744f38e 100644
--- a/res/layout-w960dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
diff --git a/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 2d1190a3..2d1190a3 100644
--- a/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
diff --git a/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml
index 64b75f0e..64b75f0e 100644
--- a/res/layout/actionview_search.xml
+++ b/src/main/res/layout/actionview_search.xml
diff --git a/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml
index 248a7822..248a7822 100644
--- a/res/layout/activity_choose_contact.xml
+++ b/src/main/res/layout/activity_choose_contact.xml
diff --git a/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index f7cb2198..f7cb2198 100644
--- a/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
diff --git a/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 97289628..97289628 100644
--- a/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
diff --git a/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index f689f10d..f689f10d 100644
--- a/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
diff --git a/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index fac499bc..fac499bc 100644
--- a/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
diff --git a/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index f9c98529..f9c98529 100644
--- a/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
diff --git a/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 12ab3da1..12ab3da1 100644
--- a/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
diff --git a/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 7053857f..7053857f 100644
--- a/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
diff --git a/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 21147b4a..21147b4a 100644
--- a/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
diff --git a/res/layout/create_contact_dialog.xml b/src/main/res/layout/create_contact_dialog.xml
index 1ab4b686..1ab4b686 100644
--- a/res/layout/create_contact_dialog.xml
+++ b/src/main/res/layout/create_contact_dialog.xml
diff --git a/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index 252808c8..252808c8 100644
--- a/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
diff --git a/res/layout/dialog_verify_otr.xml b/src/main/res/layout/dialog_verify_otr.xml
index 499ef6cd..499ef6cd 100644
--- a/res/layout/dialog_verify_otr.xml
+++ b/src/main/res/layout/dialog_verify_otr.xml
diff --git a/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index f9aae10a..f9aae10a 100644
--- a/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
diff --git a/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index d4145761..d4145761 100644
--- a/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
diff --git a/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index 95c9d24c..95c9d24c 100644
--- a/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
diff --git a/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml
index 11ce35b2..11ce35b2 100644
--- a/res/layout/manage_accounts.xml
+++ b/src/main/res/layout/manage_accounts.xml
diff --git a/res/layout/message_null.xml b/src/main/res/layout/message_null.xml
index 0e0f1c92..0e0f1c92 100644
--- a/res/layout/message_null.xml
+++ b/src/main/res/layout/message_null.xml
diff --git a/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 39bb842a..39bb842a 100644
--- a/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
diff --git a/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 3e854643..3e854643 100644
--- a/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
diff --git a/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index d5f8bb33..d5f8bb33 100644
--- a/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
diff --git a/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml
index 20a2868a..20a2868a 100644
--- a/res/layout/quickedit.xml
+++ b/src/main/res/layout/quickedit.xml
diff --git a/res/layout/share_with.xml b/src/main/res/layout/share_with.xml
index 41b6033d..41b6033d 100644
--- a/res/layout/share_with.xml
+++ b/src/main/res/layout/share_with.xml