Merge pull request #1 from dimortizp/cesaenzc-master

Cesaenzc master
Menu Fixed
+ Control de acceso finalizado
Merge remote-tracking branch 'carlos/master' into cesaenzc-master

Conflicts:
	protected/components/MenuItems.php
	protected/runtime/application.log
+ conflictos de fusion arreglados