Merge branch 'Bohan-Zheng' into rtong
Merge branch 'Bohan-Zheng' into rtong
wawawawawawa
Merge branch 'bowen' into rtong
cascading deletion
error page handle
update
done with semesterData
hello
Merge branch 'bowen' into rtong

Conflicts:
	app/controllers/StudyPlanController.java
	app/controllers/StudyPlanController2.java
	app/models/StudyPlan.java
delete studyplancontroller.java
delete comments