Merge branch 'dev' of https://github.com/kitygraph/kityminder into gh-pages

src/adapter/combobox.js

@@ -151,7 +151,10 @@ KM.registerUI( 'forecolor', function ( name ) {
         name: name,
         title: this.getLang( 'tooltips' )[ name ] || '',
         click: function () {
-            me.execCommand( name, getCurrentColor() );
+            var color =   kity.Color.parse(getCurrentColor()).toHEX();
+            if(!color == '#000000'){
+                me.execCommand( name, color );
+            }
         }
     } );