Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
commits
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
admin units
dbv lectures
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
Merge branch 'develop' of https://github.com/karsanrichard/TicketingSystem into develop

Conflicts:
	application/modules/admin/models/m_admin.php
	application/modules/users/controllers/users.php
	dbv/data/schema/lecturers.sql
ya leo
Conflicts:
timetables
Merge branch 'develop' of https://github.com/bakasajoshua/TicketingSystem into develop

Conflicts:
	application/modules/users/controllers/users.php
admin changes
timetable changes and a slight change to student_view
admin loggin