Survey Input type
Merge remote-tracking branch 'origin/dongfengsun'
FeedBack
Merge branches 'master' and 'dongfengsun' of https://github.com/infoyou/QiXin into dongfengsun

Conflicts:
	QiXin.xcodeproj/project.pbxproj