caches
Merge branch 'master' of https://github.com/nandorodpires2/newfinances2

Conflicts:
	application/modules/cliente/controllers/OrcamentosController.php
	nbproject/private/private.xml