integrate algorithm
fix conflict
Merge branch 'bowen' into shuaiwang

Conflicts:
	app/controllers/CourseController.java