Merge branch 'protobuf_update'

# Conflicts:
#	messages/control.py
#	messages/utils.py
#	protobuf/message.proto
#	protobuf/message_pb2.py

protobuf/message.proto

@@ -168,6 +168,14 @@ message ControlMessage {
     int32 status = 2;
 }
 
+message FansclubMessage {
+	Common commonInfo = 1;
+	// 升级是1，加入是2
+	int32 type = 2;
+	string content = 3;
+	User user = 4;
+}
+
 message Common{
     string method = 1;
     int64 msgId = 2;