Merge branch 'master' of https://github.com/ant-design/ant-design

components/tag/demo/control.md

@@ -41,7 +41,7 @@ const App = React.createClass({
             {tag.name}
           </Tag>
         )}
-        <Button size="small" type="primary" onClick={this.addTag}>添加标签</Button>
+        <Button size="small" type="dashed" onClick={this.addTag}>+ 添加标签</Button>
       </div>
     );
   },

components/tag/style/index.less

@@ -54,6 +54,7 @@
   &-green,
   &-yellow,
   &-red {
+    border: 0;
     &,
     a,
     a:hover,