fix conficts
Merge branch 'master' of https://github.com/yungoo/ffmpeg-converter

Conflicts:
	hivi/.DS_Store
	hivi/hivi.xcodeproj/project.xcworkspace/xcuserdata/yungoo.xcuserdatad/UserInterfaceState.xcuserstate
	hivi/hivi/PreviewController.xib
fix conflicts
support history