visualizacion en menu
Merge branch 'branch' into develop

Conflicts:
	protected/views/layouts/mainAdmin.php
again fede
fede