new in course & update views
Merge branch 'CourseBranch'