24

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

Conflicts:
	components/slide/slide.js
	components/teacher.settings/teacher.settings.html