拉取代码
愿望详细
我的动作事件添加
选择好友界面控制器
Merge branch 'master' of https://github.com/oppcat/CoProject

Conflicts:
	GoodWishes/Classes/Controllers/Hot/WishDetailViewController.xib
	GoodWishes/Classes/Controllers/Mine/EditAddressViewController.xib
	GoodWishes/Classes/Controllers/Mine/SureAddressViewController.xib