auto
Merge branch 'rtong' into shuaiwang
11

11
fix cross_linklist
Merge branch 'shuaiwang' into rtong

Conflicts:
	app/controllers/StudyPlanController.java
delete json.js
Merge branch 'Bohan-Zheng' into rtong
WantForm -> TakeForm
Merge branch 'rtong' into Bohan-Zheng