Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
Errors
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
ya leo
Conflicts:
timetables
Merge branch 'develop' of https://github.com/bakasajoshua/TicketingSystem into develop

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