Merge branch 'master' into osx_zuffy
clean the code.

delete the unuseable code.
panel manager

goingto replace panelPlayerCtrl to panelManager.
Merge branch 'osx_zuffy'