Merge branch 'master' into 2018-Jul-bontric-refactor-exchangeTask

README.md

briar-android/src/main/AndroidManifest.xml

...java/org/briarproject/briar/android/AndroidComponent.java

...riarproject/briar/android/activity/ActivityComponent.java

...t/briar/android/keyagreement/MailboxExchangeActivity.java

...briarproject/briar/android/repeater/RepeaterActivity.java

briar-android/src/main/res/layout/activity_repeater.xml

briar-android/src/main/res/layout/repeater_avatar_status.xml

briar-android/src/main/res/values/strings.xml

briar-android/src/main/res/xml/settings.xml

mailbox-android/.gitignore

mailbox-android/.tx/config

mailbox-android/artwork/bluetooth.svg

mailbox-android/artwork/ic_emoji_emoticons.svg

mailbox-android/artwork/logo_circle.svg

mailbox-android/artwork/logo_horizontal_white.svg

mailbox-android/artwork/logo_no_text.svg

mailbox-android/artwork/logo_vertical_black.svg

mailbox-android/artwork/notification_ongoing.svg

mailbox-android/artwork/notification_reminder.svg