Merge branch 'develop' of https://github.com/WillyMareka/southern_cross into develop

Conflicts:
	application/config/autoload.php
	application/config/config.php
	application/modules/admin/controllers/admin.php
	application/modules/home/views/services.php
Error
Corrections after merging with Adimas