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

Conflicts:
	dataManagement/json.api.php
Merge branch 'master' of https://github.com/DavidSalzer/Smart-Class
php
Merge branch 'master' of https://github.com/DavidSalzer/Smart-Class

Conflicts:
	student/app-student.js
	student/login/index.html