merce insert
Merge origin/master

Conflicts:
	view/ViewConsolidamentoIndex.php