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

Conflicts:
	dictionary/lang-en.json
	dictionary/lang-he.json