Merge remote-tracking branch 'origin/master'

svc/routes/product_images.go

@@ -209,6 +209,11 @@ WHERE typ='img'
 			}
 			query += `
 ORDER BY
+  CASE
+    WHEN COALESCE(file_name,'') ~* 'gallery[-_ ]*1' THEN 0
+    WHEN COALESCE(file_name,'') ~* '\(1\)(\.[A-Za-z0-9]+)?$' THEN 0
+    ELSE 1
+  END,
   COALESCE(sort_order,999999),
   zlins_dttm DESC,
   id DESC`