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

Conflicts:
	application/data/cache/zend_cache---Zend_LocaleC_pt_BR_currencynumber_
	application/data/cache/zend_cache---Zend_LocaleC_pt_BR_date_
	application/data/cache/zend_cache---Zend_LocaleC_pt_BR_date_gregorian_medium
	application/data/cache/zend_cache---Zend_LocaleL_pt_BR_symbols_
	application/data/cache/zend_cache---internal-metadatas---5bab17dc5f3af00884a16bf5dd42bdef
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_currencynumber_
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_currencysymbol_
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_currencysymbol_BRL
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_currencytoregion_BR
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_date_
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_date_gregorian_full
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_date_gregorian_medium
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_nametocurrency_
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_nametocurrency_BRL
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_time_
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleL_pt_BR_day_
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleL_pt_BR_month_
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleL_pt_BR_month_gregorian_format_abbreviated
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleL_pt_BR_symbols_
atualizacoes