修改
修改

Conflicts:
	VideoNews/Data/VNHTTPRequestManager.m
	VideoNews/Home/VNNewsDetailViewController.m
Merge branch 'master' of https://github.com/lucifer1988/VideoNews

Conflicts:
	VideoNews/Data/VNHTTPRequestManager.m