* 'dev' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness:
  add 创建生活号页面逻辑修改
  add 个人认证、身份证信息UI

# Conflicts:
#	CommonLib/Common/src/main/java/com/yidian/common/http/URLs.kt
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/CommonService.kt

* 'dev' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness:
  update：创建生活号页面UI设计优化
  add 生活号认证流程首页UI
  update：个人认证成功页面UI设计优化

# Conflicts:
#	Components/newscontent/src/main/res/layout/top_bar.xml

* 'dev' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness:
  update：个人认证成功页面UI设计实现
  update 身份证OCR测试页面

* 'dev' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness:
  add 创建生活号页面
  update：企业认证成功页面资源统一
  add：企业认证成功页面
  update 友盟依赖
  update release包域名
  update 通过Uri获取filePath
  add umeng统计SDK app key添加注释
  add 营业执照OCR
  add umeng统计SDK app key添加
  update