Merge branch 'master' into dev
fixed bugs
bug fix, change map, add audio, add cpu
updated.
Merge branch 'dev'