ff
Merge branch 'master' of https://github.com/yangyangduo/yoomid

Conflicts:
	private_share/SettingViewController.m