Estructuración del menu
Merge remote-tracking branch 'origin/master'

Conflicts:
	sade/protected/views/dptoLocal/index.php
	sade/themes/classic/views/layouts/main.php