changed animations/animationcanvas -- working on support for flags
merge with Kevin
merge