Merge origin/master

Conflicts:
	Application/plugins/empresa/ultimoindicador/classes/widgets/indicador_empresaWidget.php