[fix]by Jinqn
Merge pull request #75 from Jinqn/dev-1.3.0

Dev-1.3.0 颜色按钮,显示颜色的bug
grunt升级
Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0