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

# Conflicts:
#	app/src/main/java/com/jens/automation2/Trigger.java

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

@@ -374,7 +374,7 @@ public class ActivityMainScreen extends ActivityGeneric
 				}
 				catch (Exception e)
 				{
-					activityMainScreenInstance.tvLastRule.setText("n./a.");
+					activityMainScreenInstance.tvLastProfile.setText("n./a.");
 				}
 			}
 			else