Merge branch 'master' of https://github.com/ecomfe/echarts

# Conflicts:
#	src/echarts.js

src/coord/geo/Region.js

@@ -49,6 +49,8 @@ define(function (require) {
 
         constructor: Region,
 
+        properties: null,
+
         /**
          * @return {module:zrender/core/BoundingRect}
          */

src/coord/geo/parseGeoJson.js

@@ -111,11 +111,13 @@ define(function (require) {
                 });
             }
 
-            return new Region(
+            var region = new Region(
                 properties.name,
                 geometries,
                 properties.cp
             );
+            region.properties = properties;
+            return region;
         });
     };
 });
\ No newline at end of file

src/echarts.js

@@ -1621,12 +1621,18 @@ define(function (require) {
     };
 
     /**
+     * @DEPRECATED
      * @return {string} groupId
      */
     echarts.disConnect = function (groupId) {
         connectedGroups[groupId] = false;
     };
 
+    /**
+     * @return {string} groupId
+     */
+    echarts.disconnect = echarts.disConnect;
+
     /**
      * Dispose a chart instance
      * @param  {module:echarts~ECharts|HTMLDomElement|string} chart