rebase branch 'luhcas/master' from #174 onto the master branch

Conflicts:
	blocks/Courseware/css/courseware.css
	blocks/Section/css/section.css