Merge branch '2.x' into backport-feature-detailed-results-5-2x

Author: dodmi

data/favicon.json

@@ -45,6 +45,7 @@
 	"bandcamp.com": "bandcamp.com.png",
 	"battle.net": "battle.net.ico",
 	"bauen.de": "bauen.de.ico",
+	"bayern.de": "bayern.de.ico",
 	"bequiet.com": "bequiet.com.ico",
 	"bett1.de": "bett1.de.png",
 	"betterplace.org": "betterplace.org.ico",

data/favicon/bayern.de.ico

@@ -284,6 +284,12 @@
 			"sdid": "bauen.de",
 			"ruletype": "ALL",
 			"priority": "DEFAULT_RULE_ALL"
+		}, {
+			"domain": "bayern.de",
+			"addr": "*",
+			"sdid": "bayern.de",
+			"ruletype": "ALL",
+			"priority": "DEFAULT_RULE_ALL"
 		}, {
 			"domain": "bequiet.com",
 			"addr": "*",