just some changes
changes
Merge branch 'develop' of https://github.com/bakasajoshua/TicketingSystem into develop

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