added player animations and enemies with jump action
merged origin/master into local/master