Merge branch 'develop' of http://git.dev.yoho.cn/web/yohomarket into develop

@@ -196,11 +196,11 @@ class YHMIm_Relay
                 $queue->ack($envelope->getDeliveryTag());
                 return;
             } 
-            else if(isset($messageData['talk_id']) && isset($messageData['talk_id']))
+           /* else if(isset($messageData['talk_id']) && isset($messageData['talk_id']))
             {
             	//不接受会话中的消息
             	return;
-            }
+            }*/
             $agreement = YHMIm_Agreement::factory($messageData);
             $queueData = $agreement->getQueueData();
             $queue->ack($envelope->getDeliveryTag());