Merge branch 'rtong' into Bohan-Zheng
version6.0
version6.1
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
add take all button