Teacher Profile DONE and DB Changes
mc
mc2
mc3
puta
Merge branch 'master' of https://github.com/Zarconium/crisp

Conflicts:
	application/controllers/dbms_controller.php
Merge branch 'master' of https://github.com/Zarconium/crisp