Merge branch 'rtong'
搞定了一部分
update action.js
update hints for user
Merge branch 'bowen' into Bohan-Zheng
ll
changes
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
Merge branch 'bowen' into Bohan-Zheng
同步
submit for CCD
累死了
Merge branch 'bowen' into Bohan-Zheng
Merge branch 'Bohan-Zheng'
Merge remote-tracking branch 'origin/master' into bowen
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
update database
Merge branch 'master' into rtong
Merge branch 'bowen' into rtong