~
Merge branch 'master' of https://github.com/zxiang2013/MagazineDemo

Conflicts:
	MagazineDemo/ZXAppDelegate.h