assets updated
Merge branch 'master' into player
some changes