同步
Merge branch 'rtong' into Bohan-Zheng

Conflicts:
	app/views/stu_semester.scala.html
哈
merge with bohan
fixed bug
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 bowen
Merge remote-tracking branch 'origin/rtong' into bowen
Merge branch 'bowen' into rtong