合并代码
add user data
Merge branch 'master' of https://github.com/Fanty/bsl-client

# By fanty
# Via fanty
* 'master' of https://github.com/Fanty/bsl-client:
  修改设置版本更新的提示信息
用户数据
Merge branch 'master' of https://github.com/Fanty/bsl-client

# By fanty (3) and wyjieying (2)
# Via Fanty (2) and fanty (1)
* 'master' of https://github.com/Fanty/bsl-client:
  合并苏滨代码
  合并代码
  数字移位
  修改版本更新问题
  提示移位
用户数据
Merge branch 'master' of https://github.com/Fanty/bsl-client

# By fanty
# Via fanty
* 'master' of https://github.com/Fanty/bsl-client:
  修改群聊api
用户数据
Merge branch 'master' of https://github.com/Fanty/bsl-client

# By fanty (5) and wyjieying (2)
# Via Fanty (1) and fanty (1)
* 'master' of https://github.com/Fanty/bsl-client:
  合并代码
  合并苏滨代码
  合并苏滨代码
  同步代码
  修改消息删除模式
  整理
  pad搜索修复
修改下载提示栏 遮住的问题
Merge branch 'master' of https://github.com/Fanty/bsl-client

# By fanty (1) and wyjieying (1)
# Via Fanty (1) and fanty (1)
* 'master' of https://github.com/Fanty/bsl-client:
  修改中文api 问题
  增加backToMain 注释iscroll-lite 304行
用户数据
Merge branch 'master' of https://github.com/Fanty/bsl-client

# By fanty
# Via fanty
* 'master' of https://github.com/Fanty/bsl-client:
  合并苏滨代码
  合并苏滨的代码
修改soc 移动运行网的 资源包 防止socT人
增加移动运行网最新的html5代码
合并国东代码

合并国东代码