reorder GENERAL_COLLECTOR lists in collectors.cpp due to markers change

pcbnew/class_mire.cpp

@@ -215,7 +215,6 @@ bool MIREPCB::HitTest( const wxPoint& refPos )
     int dX    = refPos.x - m_Pos.x;
     int dY    = refPos.y - m_Pos.y;
     int rayon = m_Size / 2;
-
     return abs(dX)<=rayon && abs(dY)<=rayon;
 }
 

pcbnew/zones_by_polygon.cpp

@@ -459,12 +459,15 @@ EDGE_ZONE* WinEDA_PcbFrame::Begin_Zone( wxDC* DC )
 
             if( diag ==  ZONE_ABORT )
                 return NULL;
+			
+			GetScreen()->m_Active_Layer = s_Zone_Layer;	// Set by the dialog frame
         }
         else /* Start a new contour: init zone params (net and layer) from an existing zone */
         {
             GetScreen()->m_Active_Layer = s_Zone_Layer = s_CurrentZone->GetLayer();
             s_Zone_Hatching = s_CurrentZone->m_Poly->GetHatchStyle();
         }
+
         /* Show the Net */
         if( g_HightLigt_Status && (g_HightLigth_NetCode != s_NetcodeSelection) )
         {