wip
Addded animations
Merged
Merge branch 'animations'
FIx animation merge issues, use correct animation atlas