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