Display course and course instance name in course_instance.php
Merge branch 'master'