Merge branch 'master' into 'develop-alex'

# Conflicts:
#   app/build.gradle
#   app/src/main/java/com/virjar/majora/adr/KeepAliveService.java
#   app/src/main/java/com/virjar/majora/adr/MainActivity.java
#   app/src/main/java/com/virjar/majora/adr/Shell.java
#   app/src/main/java/com/virjar/majora/adr/TheApp.java
#   app/src/main/res/layout/activity_main.xml

app/build.gradle

 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 26
 
 
     defaultConfig {

app/src/main/java/com/virjar/majora/adr/TheApp.java

@@ -30,7 +30,6 @@ public class TheApp extends Application {
             @Override
             public void run() {
                 Shell.executeCmd("pwd");
-
             }
         }.start();
         KeepAliveService.startService(this);