Merge branch 'develop' of https://gitlab.com/tom79/mastalab into develop

app/src/main/res/layout-sw600dp/activity_login.xml

@@ -77,6 +77,7 @@
                         android:src="@drawable/ic_info_login"
                         android:layout_width="30dp"
                         android:layout_height="30dp" />
+                </LinearLayout>
                     <RadioGroup
                         android:id="@+id/set_instance_type"
                         android:layout_width="match_parent"
@@ -99,7 +100,6 @@
                             android:text="GNU"
                             />
                     </RadioGroup>
-                </LinearLayout>
             </android.support.design.widget.TextInputLayout>
             <LinearLayout
                 android:layout_width="300dp"

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files