Merge branch 'master' of https://github.com/runelite/runelite

# Conflicts:
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/HitpointsDisplayStyle.java
#	runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
#	runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java

runelite-client/src/main/resources/item_variations.json

@@ -3243,7 +3243,8 @@
     6125,
     6126,
     6127,
-    13079
+    13079,
+    23458
   ],
   "branch": [
     3692,
@@ -6912,6 +6913,78 @@
     10555,
     20515
   ],
+  "attacker icon": [
+    10556,
+    22346,
+    22347,
+    22348,
+    22349,
+    22721,
+    22722,
+    22723,
+    22729,
+    22730,
+    23460,
+    23461,
+    23462,
+    23463,
+    23464,
+    23465
+  ],
+  "collector icon": [
+    10557,
+    22312,
+    22313,
+    22314,
+    22315,
+    22337,
+    22338,
+    22339,
+    22724,
+    23471,
+    23472,
+    23473,
+    23474,
+    23475,
+    23476,
+    23477
+  ],
+  "defender icon": [
+    10558,
+    22340,
+    22341,
+    22342,
+    22343,
+    22344,
+    22345,
+    22725,
+    22726,
+    22727,
+    22728,
+    23466,
+    23467,
+    23468,
+    23469,
+    23470
+  ],
+  "healer icon": [
+    10559,
+    10567,
+    20802,
+    22308,
+    22309,
+    22310,
+    22311,
+    23478,
+    23479,
+    23480,
+    23481,
+    23482,
+    23483,
+    23484,
+    23485,
+    23486
+  ],
   "keris": [
     10581,
     10582,