Application version naming fix

android/build.gradle

@@ -76,7 +76,7 @@ android {
         if (!variant.buildType.name.equals("devel")) {
             variant.outputs.each { output ->
                 def file = output.outputFile
-                output.outputFile = new File(file.parent, file.name.replace(".apk", "-" + tablexiaVersionName + ".apk").replace("android", appName))
+                output.outputFile = new File(file.parent, file.name.replace(".apk", "-" + tablexiaVersionName + ".apk").replace("android", tablexiaAppName))
             }
         }
     }

build.gradle

@@ -286,8 +286,10 @@ def getVersionNameFromGit() {
         }
         String numberOfCommits = stdout.toString().trim()
 
-        // add branch name and number of commits
-        result = "${result}-${numberOfCommits}"
+        if (!"0".equals(numberOfCommits)) {
+            // add branch name and number of commits
+            result = "${result}-${numberOfCommits}"
+        }
     }
     return result
 }