fixed some button bugginess
Merge branch 'master' of https://github.com/kongming92/emgame
fixed the putting charges while in play mode
fixed the merge errors