Merge branch '2DAnimation'

Conflicts:
Assets/Textures/Item_01.png.meta