Merge branch 'master' of http://repos.ubtob.net/usoft-andriod/uas_mes

# Conflicts:
#	build.gradle

build.gradle

@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-//test
+
 buildscript {
 //    ext.kotlin_version = '1.2.30'
     repositories {