added animations and sprite strips
merged animations with master and fixed conflicts