fixed podspec pop issue
more headers for the umbrella header
include upload header in video api file
lots of type and warning fixes
add fan content param to video upload method
Merge branch 'master' into camera