Survey mark & User Edit @Adam
Merge remote-tracking branch 'origin/dongfengsun'

Conflicts:

Application/Project/Controller/BJControllers/Libary/BJLibaryCommentsView
Controller.m
Merge remote-tracking branch 'origin/dongfengsun'
1，User Edit；
2，Update Soft；
3，News Show；
Lastest Version
1, 区分 Survey & Test 结果；
2, 做好当前题目才能做下一道；
3，
Merge branch 'master' of https://github.com/infoyou/QiXin into dongfengsun