integrate algorithm
fix conflict
Merge branch 'bowen' into shuaiwang

Conflicts:
	app/controllers/CourseController.java
add course in semester and display them
update study plan
Merge remote-tracking branch 'origin/shuaiwang' into bowen
update study plan
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
fix
rtong nima
update action.js
update hints for user
Merge branch 'bowen' into Bohan-Zheng