Many changes
Merge branch 'master' of https://github.com/ValdisVitolins/JTM_teacher