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

Conflicts:
	nbproject/private/private.xml
caches
atualizacoes
Merge branch 'master' of https://github.com/nandorodpires2/newfinances2

Conflicts:
	application/data/cache/zend_cache---internal-metadatas---0b6a4f3f58839a5ee2b0051413ea912c
	application/data/cache/zend_cache---internal-metadatas---10de3b0a1f682c3c59294ff288aebe91
	application/data/cache/zend_cache---internal-metadatas---29eb1ac3c1aacd30cf1f46dbfb313dca
	application/data/cache/zend_cache---internal-metadatas---4f5dcca44f229a049676579643f125fb
	application/data/cache/zend_cache---internal-metadatas---6011e0e50c2cc80229345f037011d578
	application/data/cache/zend_cache---internal-metadatas---6bb923d4dc6268cc6f6fe644ad915008
	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_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_
	application/data/cache/zend_cache---internal-metadatas---b01c8d953c86a2eb43bfae7848a24a3a
	application/data/cache/zend_cache---internal-metadatas---b8d6c57d7c963b20d023a6536783c33b
	nbproject/private/private.xml