Merge branch 'dev' into dev2

# Conflicts:
#	settings/builder.json

assets/scripts/common/Platform.js

@@ -373,6 +373,11 @@ class Platform {
 
     static handelOnShow() {
         if (GameGlobal.isOnHide) {
+
+            if (GameModule.audioMng) {
+                GameModule.audioMng.playBgm();
+            }
+
             GameGlobal.isOnHide = false;
 
             //客户端优先刷新技能使用情况

assets/scripts/utils/AudioMng.js

@@ -107,6 +107,7 @@ cc.Class({
      */
     stopAll () {
         cc.audioEngine.stopAll();
+        delete this.currentAudio['bgm'];
     },
 
     /**