Merge remote-tracking branch 'eleme/master' into dev

examples/versions.json

-{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4"}
\ No newline at end of file
+{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.5.0":"2.4"}
\ No newline at end of file

package.json

 {
   "name": "element-ui",
-  "version": "2.4.11",
+  "version": "2.5.0",
   "description": "A Component Library for Vue.js.",
   "main": "lib/element-ui.common.js",
   "files": [

packages/theme-chalk/package.json

 {
   "name": "element-theme-chalk",
-  "version": "2.4.11",
+  "version": "2.5.0",
   "description": "Element component chalk theme.",
   "main": "lib/index.css",
   "style": "lib/index.css",

src/index.js

@@ -172,7 +172,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.4.11',
+  version: '2.5.0',
   locale: locale.use,
   i18n: locale.i18n,
   install,