* dev_main:
  11

* 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  fix bugs

# Conflicts:
#	PhoneManager/Class/Page/Settings/ViewController/SettingViewController.swift

* dev_main:
  优化

* dev_main:
  【恢复】部分代码

* 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  优化

* 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  【优化】排序

* 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  优化

* yQz0507:
  优化

* 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  优化
  fix bus
  优化
  优化
  优化

* yQz0507:
  优化
  优化
  优化

* dev_main:
  【优化】修改图片
  推送规则更改,上报完善，bug修复

# Conflicts:
#	PhoneManager/AppDelegate.swift

* dev_main:
  推送规则更改,上报完善，bug修复

# Conflicts:
#	PhoneManager/Class/Page/Contact/View/Dup/MergeButtonView.swift
#	PhoneManager/Class/Page/Home/View/TrashSubView.swift
#	PhoneManager/Class/Page/Trash/Controller/TrashViewController.swift

* dev_main:
  【优化】压缩图片方法+视频静音
  【优化】广告更新

# Conflicts:
#	PhoneManager/Class/Page/Home/Common/VideoViewController.swift
#	PhoneManager/Class/Page/Home/View/PhotosRemoveBaseView.swift