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

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

...r/fragment/mainactivity/main/SubscriptionsFeedFragment.kt

...tformplayer/fragment/mainactivity/main/VideoDetailView.kt

...uto/platformplayer/views/subscriptions/SubscriptionBar.kt

...rmplayer/views/subscriptions/SubscriptionExploreButton.kt

app/src/main/res/drawable/background_button_explore.xml

...src/main/res/drawable/background_button_explore_inner.xml

app/src/main/res/drawable/sub_group_demo.png

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

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

...c/main/res/layout/view_subscription_group_bar_explore.xml

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