update
Merge branch 'master' of https://github.com/marcocollado/barker-ph-codeigniter

Conflicts:
application/config/config.php
update