News & Survey
modfiy fengzhi suggestions
Merge branch 'master' of https://github.com/infoyou/QiXin into dongfengsun

modify fengzhi's suggetions
show version
show version
Survey Input type
Merge remote-tracking branch 'origin/dongfengsun'
modify file download bugs
certificate
FeedBack
Survey mark & User Edit @Adam
Merge branches 'master' and 'dongfengsun' of https://github.com/infoyou/QiXin into dongfengsun

Conflicts:
	QiXin.xcodeproj/project.pbxproj
stash
add coach feedback
add coach feedback
prepare powre hour to be finished
modify xcode config
Merge remote-tracking branch 'origin/dongfengsun'

Conflicts:

Application/Project/Controller/BJControllers/Libary/BJLibaryCommentsView
Controller.m
Merge remote-tracking branch 'origin/dongfengsun'
chairman right