Player
Initial Hieu branch;
remove conflict
fixed bugs
fix conlicts