愿望兑换流程
我的愿望－>愿望详细－>兑换
Merge branch 'master' of https://github.com/oppcat/CoProject

Conflicts:
	GoodWishes/Classes/Controllers/Hot/WishDetailViewController.m
	GoodWishes/Classes/Controllers/Hot/WishDetailViewController.xib