Merge branch 'feature/newplayer' into develop
Merge branch 'develop' into feature/newplayer
Merge branch 'feature/newplayer' into develop
delete the old code,and copy the old codes to oldplay.js