Merge branch 'master' into dev

* master:
  图片模式时，封面图使用uiimageview渲染
  Revert "图片模式时，封面图使用uiimageview渲染"
  图片模式时，封面图使用uiimageview渲染
  Revert "镜头反转"

# Conflicts:
#	BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenCameraManager.swift
#	BFRecordScreenKit/Classes/RecordScreen/View/ProgressView/BFCameraProgressView.swift

BFRecordScreenKit/Classes/RecordScreen/View/Cell/BFImageCoverViewCell.swift

@@ -84,6 +84,7 @@ open class BFImageCoverViewCell: UICollectionViewCell {
         if(recordItem?.mediaType == .Image){
             playImageView.image = coverImg
         }else{
+            playImageView.removeFromSuperview()
             picture = GPUImagePicture(image: coverImg)
             picture.addTarget(filter)
             filter.addTarget(playView)