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
Merge branch 'develop' of https://github.com/bakasajoshua/TicketingSystem into develop

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