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

Conflicts:
	application/data/cache/zend_cache---internal-metadatas---5bab17dc5f3af00884a16bf5dd42bdef
atualizacoes