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

Conflicts:
	components/slide/slide.html