Merge remote-tracking branch 'origin/rtong' into bowen
updeate semester page
Merge remote-tracking branch 'origin/rtong' into bowen
submit -> submitCourse
11

11
use session
Merge branch 'bowen' of https://github.com/xixixhalu/sss into bowen
312
Merge branch 'bowen' into Bohan-Zheng
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