修正
Merge branch 'master' of https://github.com/IanOrganization/YueYeWan

Conflicts:
	YueYeWan/YueYeWan/Controller/Main/MainViewController.m