Merge remote-tracking branch 'LmeSzinc/master' into dev

# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json

module/config/argument/task.yaml

@@ -123,6 +123,12 @@ Event:
     EventGeneral:
       - EventGeneral
       - TaskBalancer
+    Coalition:
+      - Scheduler
+      - Campaign
+      - Coalition
+      - StopCondition
+      - Emotion
     Event:
       - Scheduler
       - Campaign
@@ -188,12 +194,6 @@ Event:
       - Hospital
       - StopCondition
       - Emotion
-    Coalition:
-      - Scheduler
-      - Campaign
-      - Coalition
-      - StopCondition
-      - Emotion
     MaritimeEscort:
       - Scheduler
       - MaritimeEscort
@@ -217,6 +217,12 @@ EventDaily:
   menu: 'collapse'
   page: 'setting'
   tasks:
+    CoalitionSp:
+      - Scheduler
+      - Campaign
+      - Coalition
+      - StopCondition
+      - Emotion
     EventA:
       - Scheduler
       - EventDaily
@@ -272,12 +278,6 @@ EventDaily:
       - Campaign
       - StopCondition
       - Emotion
-    CoalitionSp:
-      - Scheduler
-      - Campaign
-      - Coalition
-      - StopCondition
-      - Emotion
 
 # ==================== Reward ====================