Master changes
Merge branch 'develop' of https://github.com/johnotaalo/TicketingSystem into develop
changed htaccess and base_url