Merge branch 'master' into chrisDev
Player animation
Merge branch 'chrisDev'