changed the course homepage to have timeline as a widget
fixed conflicts merging master