Merge branch 'rtong' into shuaiwang
fix bug: if a simple requirement already exists
fix addCourse
Merge branch 'shuaiwang' into rtong

Conflicts:
	app/controllers/StudyPlanController.java