Merge branch 'master' of http://120.77.149.83/root/browser-backend into dev-zrj

 Conflicts:
	src/main/java/com/edgec/browserbackend/common/utils/Trans.java

src/main/java/com/edgec/browserbackend/common/utils/Trans.java

 package com.edgec.browserbackend.common.utils;
+
 import com.edgec.browserbackend.common.commons.utils.NotifyUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
@@ -82,13 +83,11 @@ public class Trans {
 
             HttpEntity entry = response.getEntity();
 
-            if(entry != null)
-            {
+            if (entry != null) {
                 InputStreamReader is = new InputStreamReader(entry.getContent());
                 BufferedReader br = new BufferedReader(is);
                 String str = null;
-                while((str = br.readLine()) != null)
-                {
+                while ((str = br.readLine()) != null) {
                     sb.append(str.trim());
                 }
                 br.close();