Correcciones menores
Merge branch 'master' of https://github.com/IESMonterroso/intranet

Conflicts:
	config/version.php