Merge branch 'master' into dev
lecture text parsing
Merge branch 'dev'