Merge
Merge branch 'master' of https://github.com/lgsanjos/RendimentosFinanceirosApp

Conflicts:
	app/res/layout/linear_layout.xml
	app/res/layout/stock_trade_detail.xml
	app/src/br/com/itibansistemas/rendimentos/stock/ui/StockTradesDetailActivity.java