Merge remote-tracking branch 'origin/master'

Service/DevicePushService.py

@@ -200,7 +200,7 @@ class DevicePushService:
         """
         try:
             types = []
-            combo_types = [51, 57, 58, 59, 60, 61,
+            combo_types = [51, 57, 58, 60, 59, 61,
                            62, 63, 64, 65, 66]
             event_type = str(event_type)
             len_type = len(event_type)