hello
Merge branch 'bowen' into rtong

Conflicts:
	app/controllers/StudyPlanController.java
	app/controllers/StudyPlanController2.java
	app/models/StudyPlan.java
delete studyplancontroller.java
delete comments
fix conflict