merge master
merge product
grunt
修复mac下讨论闪烁的问题
grunt