1121313
algorithm pre_and_core
Merge branch 'shuaiwang' into rtong

Conflicts:
	app/controllers/StudyPlanController.java
	app/controllers/algorithm/pre_and_core/Course_Selection.java
	conf/application.conf