Merge branch 'master' into player
first animations of player
Merge branch 'master' into player
some changes
Merge branch 'master' into player
animation works
merge