Merge branch 'player' of https://github.com/Inlife/video-cube
Merge branch 'master' of https://github.com/Inlife/video-cube