Update teacher_pickinglist.html
Merge branch 'master' into production
Merge branch 'production' of https://github.com/chewou/xue into production
Merge remote-tracking branch 'upstream/production'
update