Merge branch 'shuaiwang' into rtong
-5 --> 96 twice bug fixed
Merge branch 'bowen' into rtong

Conflicts:
	app/controllers/StudyPlanController.java
display courses on step1
merge with bowen
Merge branch 'bowen' into rtong
clear: both
Merge branch 'master' into rtong
Merge branch 'bowen' into rtong
Merge remote-tracking branch 'origin/rtong' into bowen