fix bug and more update to charinfo scene
Merge remote-tracking branch 'origin/master' into JuanBranch