Menu con permisos
Merge remote-tracking branch 'Rafael/master'

Conflicts:
	protected/runtime/application.log
.