error page handle
update
hello
Merge branch 'bowen' into rtong

Conflicts:
	app/controllers/StudyPlanController.java
	app/controllers/StudyPlanController2.java
	app/models/StudyPlan.java
delete studyplancontroller.java
delete comments
update
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
update database and assign semester
update database
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
boands
add left help panel

add left help panel
fix conflict
ejh
ban chengpin

banchengpin
Semester delete course button  notation
update
update
Merge remote-tracking branch 'origin/ChenyangBai' into bowen