changes in animations but pull Kriss changes first
merge conflicts fixed
circles animations
Merge branch 'master' of https://github.com/citizengit/loople