BS3 Calendario, diario de actividades y guardias
BS·3 guardias
Merge branch 'master' of https://github.com/IESMonterroso/intranet

Conflicts:
	admin/calendario/diario/calendario.php
	admin/calendario/diario/index.php
	admin/calendario/diario/jcal_post.php