Merge branch 'master' into production
Merge branch 'master' into production
Update application.html
Update list-vert.html
Update list-vert.html
Update homepage.html
Update homepage.html
Update withnews.html
Update withnews.html
update re
retest
fix 0 to filter_opt
filter_opt hardcoded to 0
test--解决导师制已通过则不能被第二个老师选择
Update teacher_pickinglist.html
Update teacher_pickinglist.html
Merge branch 'production' of https://github.com/chewou/xue
test production and master brance:
test
Merge branch 'master' of https://github.com/chewou/xue
Merge pull request #1 from chewou/master

在开发频道测试