jum
Merge remote-tracking branch 'carlos/master' into cesaenzc-master
Menu arreglado
+inicio control de acceso
Merge remote-tracking branch 'carlos/master' into cesaenzc-master

Conflicts:
	protected/runtime/application.log
Merge pull request #1 from dimortizp/cesaenzc-master

Cesaenzc master