Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	fastlane/metadata/android/en-US/changelogs/133.txt

app/src/main/java/com/jens/automation2/ActivityMainScreen.java

@@ -434,7 +434,7 @@ public class ActivityMainScreen extends ActivityGeneric
 			else
 				activityMainScreenInstance.checkForNews();
 
-			if(BuildConfig.FLAVOR.equals("apkFlavor") && Settings.automaticUpdateCheck)
+			if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_apk) && Settings.automaticUpdateCheck)
 			{
 				Calendar now = Calendar.getInstance();
 				if (Settings.lastUpdateCheck == Settings.default_lastUpdateCheck || now.getTimeInMillis() >= Settings.lastUpdateCheck + (long)(Settings.updateCheckFrequencyDays * 24 * 60 * 60 * 1000))

app/src/main/java/com/jens/automation2/Miscellaneous.java

@@ -760,7 +760,7 @@ public class Miscellaneous extends Service
 			else
 				replacement = "unknownVariable";
 
-			source = source.substring(0, pos1) + replacement + source.substring(pos2);
+			source = source.substring(0, pos1) + replacement + source.substring(pos2 +1);
 		}
 		
 //		Miscellaneous.logEvent("i", "URL after replace", source);

fastlane/metadata/android/en-US/changelogs/133.txt

@@ -1 +1,2 @@
+* Fixed: [variable-name] was incorrectly replaced with an ] at the end
 * Added: Chinese translation (simplified)