Merge remote-tracking branch 'origin/master'
re structure timetable markup and styling
catch when user right clicks