remove useless update
Merge branch 'master' into fun_video_play
update
add upload util
Merge branch 'fun_video_play' into fun_video_info
add choose file fragment
add SettingFragment.java
update video status
Merge branch 'fun_video_info'