student archive view prob, hoe combineer je 2 queries
Merge branch 'master' of https://github.com/Prikkel/UML

Conflicts:
	application/controllers/dashboard.php
	application/models/flexi_auth_model.php