Master changes
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
no message

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
changed htaccess and base_url
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
Uploads and other necessary changes in students
Errors
Merge branch 'develop' of https://github.com/bakasajoshua/TicketingSystem into develop

Conflicts:
	application/modules/student/controllers/student.php
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
Very many things
Lecturer based
ya leo
Conflicts:
timetables