Merge pull request #10 from imcj/cj

合并代码
修复合并错误
添加颜色动画计算
修改颜色动画计算
UPDATE
Merge remote-tracking branch 'origin/dev' into cj