update stu_course
update stu_course
fix conflict
change sql password
continue fix addCourse
Merge branch 'rtong' into shuaiwang

Conflicts:
	app/controllers/StudyPlanController.java
Merge branch 'shuaiwang' into rtong
Merge branch 'bowen' into rtong