ש
Merge branch 'master' of https://github.com/DavidSalzer/Smart-Class

Conflicts:
	components/teacher.header/teacher.header.js
	components/teacher.playLesson/teacher.playLesson.html