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

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

Conflicts:
	application/data/cache/zend_cache---956336b0f9fc8b3dd3a14e0c6fa0e0fa
	application/data/cache/zend_cache---Zend_LocaleC_pt_BR_currencynumber_
	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---1f39f9aa6b9b09243275887219f0071b
	application/data/cache/zend_cache---internal-metadatas---24ea7df21fee732a4d0d408ff3def3ae
	application/data/cache/zend_cache---internal-metadatas---329733b78fe66fb46bb243e883d5bc02
	application/data/cache/zend_cache---internal-metadatas---5bab17dc5f3af00884a16bf5dd42bdef
	application/data/cache/zend_cache---internal-metadatas---6d451e0631de807f90a78735081ceed7
	application/data/cache/zend_cache---internal-metadatas---7546b7063ba4a4f5b56c7b1fc5a700fa
	application/data/cache/zend_cache---internal-metadatas---956336b0f9fc8b3dd3a14e0c6fa0e0fa
	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_day_gregorian_format_wide_tue
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_month_gregorian_format_wide_12
	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---b2afb8aacc2e3d13bf23e56aec5e79a5
	application/data/cache/zend_cache---internal-metadatas---c59237e6a22e6b2ad9791f99448ad41e
	application/data/cache/zend_cache---internal-metadatas---db890a627f45fc2a4e4677e2a9745cb0
	application/forms/Admin/Plano/CadastroFuncionalidade.php
atualixacoes