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

Conflicts:
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_day_gregorian_format_wide_fri
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_month_gregorian_format_wide_1
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_month_gregorian_format_wide_2
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_month_gregorian_format_wide_3
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_month_gregorian_format_wide_4
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_month_gregorian_format_wide_5
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_month_gregorian_format_wide_6
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_month_gregorian_format_wide_7
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_month_gregorian_format_wide_8
	application/data/cache/zend_cache---internal-metadatas---Zend_LocaleC_pt_BR_month_gregorian_format_wide_9
	application/data/cache/zend_cache---internal-metadatas---a90bf3e37330fc778bc2a8c57dc316e1