alteracoes
Merge branch 'master' of https://github.com/nandorodpires2/newfinances

Conflicts:
	application/modules/cliente/controllers/MetasController.php
	application/modules/cliente/views/scripts/metas/index.phtml
	library/Application/Controller.php
	public/views/js/meta/index.js