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