auto
Merge branch 'rtong' into shuaiwang
11

11
fix cross_linklist
Merge branch 'shuaiwang' into rtong

Conflicts:
	app/controllers/StudyPlanController.java
delete json.js
Merge branch 'Bohan-Zheng' into rtong
WantForm -> TakeForm
commit
Merge branch 'rtong' into Bohan-Zheng
m
step1 -> step2
Merge branch 'rtong' into Bohan-Zheng

Conflicts:
	app/views/stu_semester.scala.html
11

11
Merge branch 'Bohan-Zheng' into rtong

Conflicts:
	app/controllers/StudyPlanController.java
同步
222

222
Merge branch 'rtong' into Bohan-Zheng

Conflicts:
	app/views/stu_semester.scala.html
哈
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen