Undesired commi
Merge branch 'master' of https://github.com/cdechery/doacoes

Conflicts:
	application/config/database.php
	application/config/routes.php