null comments off
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/rate/profile.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/rate/course.html
null comments off