Merge branch 'devel' of ssh://storage.hided.net:2525/devsam/core into devel

hwe/b_genList.php

@@ -93,7 +93,7 @@ switch ($type) {
     case 5: $orderSQL = "order by crew desc"; break;
     case 6: $orderSQL = "order by killturn"; break;
     case 7: $orderSQL = "order by turntime"; break;
-    case 8: $orderSQL = "order by troop_leader desc"; break;
+    case 8: $orderSQL = "order by troop desc"; break;
 }
 
 $generals = $db->query(

hwe/sammo/Command/General/che_화계.php

@@ -128,6 +128,7 @@ class che_화계 extends Command\GeneralCommand
 
     protected function initWithArg()
     {
+        $this->setNation();
         $this->setDestCity($this->arg['destCityID']);
         $this->setDestNation($this->destCity['nation']);