change made for body animation
conflict removede
Merge branch 'develop'
updated with closeother tab