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

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

Conflicts:
	dataManagement/log/sqlError.log
Merge branch 'master' of https://github.com/DavidSalzer/Smart-Class

Conflicts:
	components/login/login.js
	components/slide/PlaySlide.js
	services/lessonData.js
//
Merge branch 'master' of https://github.com/DavidSalzer/Smart-Class