schedule fix and user lectures
Merge branch 'develop' into staging