Adding changes after rebasing with master
Merge branch 'animatebtns'