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
Merge branch 'shuaiwang' into Bohan-Zheng
update
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
update database and assign semester
update database
version3.0
version3.1
version4.0
version5.0
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
boands
add left help panel

add left help panel
fix conflict
ejh