Varios

Cambios menores
Merge branch 'master' of https://github.com/SADE-DSI/Sade

Conflicts:
	sade/protected/views/layouts/gui.php