Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

app/src/main/java/com/futo/platformplayer/Settings.kt

app/src/main/java/com/futo/platformplayer/UIDialogs.kt

app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt

...n/java/com/futo/platformplayer/activities/MainActivity.kt

...va/com/futo/platformplayer/activities/SettingsActivity.kt

...va/com/futo/platformplayer/dialogs/ImportOptionsDialog.kt

...formplayer/fragment/mainactivity/main/CreatorsFragment.kt

app/src/main/java/com/futo/platformplayer/states/StateApp.kt

...c/main/java/com/futo/platformplayer/states/StateBackup.kt

...m/futo/platformplayer/views/adapters/CommentViewHolder.kt

...rmplayer/views/adapters/CommentWithReferenceViewHolder.kt

...futo/platformplayer/views/adapters/SubscriptionAdapter.kt

.../platformplayer/views/overlays/slideup/SlideUpMenuItem.kt

app/src/main/res/layout/activity_settings.xml

app/src/main/res/layout/dialog_import_options.xml

app/src/main/res/layout/dialog_multi_button.xml

app/src/main/res/layout/fragment_creators.xml

app/src/main/res/values/strings.xml

app/src/stable/assets/sources/youtube

app/src/unstable/assets/sources/youtube