comments_01
Merge branch 'master' of github.com:1u/hmmm

Conflicts:
	client/views/courses/course.list.js