page caching fix attempt
Merge remote-tracking branch 'origin/new_master' into new_master

Conflicts:
	lms/templates/courseware/course_about.html
page caching fix attempt