支付宝调试

支付宝调试
Merge branch 'master' of https://github.com/iOS-Programmers/HuiTuTicket

Conflicts:
	HuiTuTicket.xcodeproj/project.pbxproj