Updated settings example
Added teacher
Missing components
Merge branch 'master' into demo