config
Merge branch 'master' of https://github.com/tarsodecastro/geradoc

Conflicts:
	application/config/email.php
Merge branch 'master' of https://github.com/tarsodecastro/geradoc