step1 -> step2
Merge branch 'rtong' into Bohan-Zheng

Conflicts:
	app/views/stu_semester.scala.html