QRCode
Merge branch 'master' of https://github.com/icylydia/YouBaoOC

Conflicts:
	EncyHomePageViewController.m
	YouBaoOC.xcodeproj/project.pbxproj