LTI fixes
Merge branch 'local'
Merge branch 'master' of https://github.com/dscourse/public

Conflicts:
	course.php