团购详情第二个界面
Merge branch 'master' of https://github.com/swtlovewtt/yikoudai

Conflicts:
	YiKouDai/YiKouDai/UI/VC/RegisterViewController.xib