merge with bohan
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
auto
update algorithm
Merge remote-tracking branch 'origin/shuaiwang' into bowen
auto ajax
auto ajax bowen
Merge remote-tracking branch 'origin/rtong' into bowen
update db, add part of autofill code
Merge branch 'bowen' into Bohan-Zheng