Merge branch 'rtong'
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
submit for CCD
累死了
Merge branch 'bowen' into Bohan-Zheng
Merge branch 'Bohan-Zheng'
CCD
Merge remote-tracking branch 'origin/master' into bowen
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
update database
Merge branch 'master' of https://github.com/xixixhalu/sss
Merge branch 'master' into rtong
Merge branch 'bowen' into rtong
改了一下css