bit of animSprite
merge master changes in collision branch