Master changes
config
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
start mails
first mail
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
whatever
adjectivos
Database tables added
Weekend Changes
Malizad the student home page and added the sms API
admin features
Just some changes
walimada
Conflicts:
Merge branch 'develop' of https://github.com/karsanrichard/TicketingSystem into develop

Conflicts:
	application/modules/home/views/home.php
Merge branch 'develop' of https://github.com/bakasajoshua/TicketingSystem into develop
Merged with JOSH