edited mediaPlayer
Merge branch 'Version1.0' into combo_animation
Edited the boom button and combo
Merge branch 'combo_animation' into Version1.0