111
Merge branch 'shuaiwang' into rtong

Conflicts:
	app/controllers/StudyPlanController.java
fix hashmap bug
Merge branch 'rtong' into shuaiwang

Conflicts:
	app/controllers/StudyPlanController.java