修改了0528bug
testmerge
testasdfasdfasdf
asdfjkaskjfdkjaskjdf
adfkajkssdfjkaskjdfkjaskjdf
清除缓存动画
Merge remote-tracking branch 'lipeng/master' into temp