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

Conflicts:
	components/lesson/lesson.js
	components/login/login.js