Merge remote-tracking branch 'origin/master' into parse-pcap

# Conflicts:
#	src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java

src/main/java/ru/serega6531/packmate/model/CtfService.java

@@ -22,6 +22,6 @@ public class CtfService {
 
     private boolean mergeAdjacentPackets;
 
-    private boolean inflateWebSockets;
+    private boolean parseWebSockets;
 
 }

src/main/java/ru/serega6531/packmate/model/Packet.java

@@ -53,7 +53,7 @@ public class Packet {
 
     private boolean ungzipped;
 
-    private boolean webSocketInflated;
+    private boolean webSocketParsed;
 
     private byte[] content;
 

src/main/java/ru/serega6531/packmate/model/Pattern.java

@@ -28,6 +28,8 @@ public class Pattern {
     @GeneratedValue(generator = "pattern_generator")
     private int id;
 
+    private boolean enabled;
+
     private String name;
 
     private String value;

src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java

@@ -5,5 +5,6 @@ public enum SubscriptionMessageType {
     DELETE_SERVICE, DELETE_PATTERN,
     NEW_STREAM,
     COUNTERS_UPDATE,
+    ENABLE_PATTERN, DISABLE_PATTERN,
     PCAP_STARTED, PCAP_STOPPED
 }