no message
Merge branch 'master' of https://github.com/zhjch80/RMVideo

Conflicts:
	RMVideo/Vendors/ViewControllers/BaseViewController/RMDownLoadBaseViewController.m
	RMVideo/Vendors/ViewControllers/CenterViewControlers/全网热榜/日榜/RMDailyListViewController.m
	RMVideo/Vendors/ViewControllers/CenterViewControlers/登录/RMLoginViewController.m
	RMVideo/Vendors/ViewControllers/CenterViewControlers/设置/RMSetupViewController.m
	RMVideo/Vendors/ViewControllers/CenterViewControlers/设置/RMSetupViewController.xib
	RMVideo/Vendors/ViewControllers/CenterViewControlers/设置/我的收藏/RMDownMoreViewController.m
Merge branch 'master' of https://github.com/zhjch80/RMVideo