ff
Merge branch 'rtong' into shuaiwang

Conflicts:
	app/controllers/StudyPlanController.java
	app/controllers/algorithm/pre_and_core/CrossLinkedList.java
Merge branch 'shuaiwang' into rtong