Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
commits
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
admin units
dbv lectures
Merge branch 'develop' of https://github.com/bakasajoshua/TicketingSystem into develop

Conflicts:
	application/modules/student/controllers/student.php