Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/build.gradle
#	app/src/androidTest/java/net/sharksystem/sharknet/ChannelListViewTest.java
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/AddChannelTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/AddContactTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/AddMessageTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/ChannelListTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/ChannelViewTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/ContactListTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/ContactViewTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/FirstStartTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/HubListTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/HubViewTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/MessageViewTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/NetworkTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/RadarFragmentTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/ReceiveCredentialsTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/fragments/SettingsFragmentTest.kt
#	app/src/androidTest/java/net/sharksystem/sharknet/navigation/DrawerTest.java
#	app/src/androidTest/java/net/sharksystem/sharknet/navigation/PathTest.java
#	app/src/androidTest/java/net/sharksystem/sharknet/ui/MainActivityTest.java
#	app/src/androidTest/java/net/sharksystem/sharknet/ui/channel/ChannelTest.java
#	app/src/androidTest/java/net/sharksystem/sharknet/ui/firstLaunch/FirstLaunchTest.java
#	app/src/main/AndroidManifest.xml