[UPDATE]
Merge branch 'master' of https://github.com/paulovidalpereira/codeigniter_base