Merge branch 'master' of http://10.1.235.20:3000/ipu/ipu-guide

# Conflicts:
#	show-server/src/main/webapp/ipu/frame/mobile/expand-mobile.js

show-server/src/main/webapp/ipu/frame/mobile/expand-mobile.js

@@ -651,7 +651,6 @@ define(["require","jcl"],function(require,Wade) {
			},getJpushInfo:function(callback,err){
				storageCallback("getJpushInfo", callback);
				execute("getJpushInfo",[],err)
			}
            },openCustUrl:function (url,callback,title, buttons, styles, hideTopBar, err) {
                storageCallback("openCustUrl", callback);
                execute("openCustUrl", [encodeURIComponent(url), title, buttons, styles, hideTopBar],err);