init
Merge branch 'dev' of https://github.com/xingyuzhe/xplayer into dev
init