Update sort order news listing
Add lecture and course details
Merge with upstream