Pickup and some player animation
Merge branch 'PickUp3107'