Merge branch 'master' of https://github.com/iview/iview into carousel

Conflicts:
	src/styles/components/index.less
	test/app.vue
	test/main.js

src/components/carousel/carousel-item.vue

@@ -21,7 +21,7 @@
                     width: `${this.width}px`,
                     height: `${this.height}`,
                     left: `${this.left}px`
-                }
+                };
             }
         },
         compiled () {