fixed 3d animate
handle conflict
fix conflict

fix conflict
add flip
fix a flip animate bug
Merge branch 'BE-FE-master'
fix conflict

fix conflict