by xlzou:首页数据 我的界面调整 引入微信支付和支付宝支付sdk
Merge branch 'master' of https://github.com/oppcat/CoProject

Conflicts:
	GoodWishes.xcodeproj/project.pbxproj
	GoodWishes/AppDelegate.m