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

Conflicts:
	components/teacher.settings/teacher.settings.js
	components/teacher.studentsTable/teacher.studentsTable.html
Merge branch 'master' of https://github.com/DavidSalzer/Smart-Class