Merge branch 'master' of http://10.108.64.190:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

GameClient/Assets/Editor/Excel/CodeBuilder.cs

@@ -276,6 +276,7 @@ namespace GFGEditor
         }
         private static void ParseDataColumn(string annotation, string type, string name, string nameWhole, string typeWhole, int index)
         {
+            annotation = annotation.Replace("\n", " ");
             if (type.Length > 0 && name.Length > 0)
             {