calendario
Merge remote-tracking branch 'origin/master'

Conflicts:
	_inc/_smarty/templates/docente/columna.centro.calendario.eventos.tpl
	_inc/_smarty/templates/docente/columna.left.tpl
	_inc/clases/Evento.php
	docente/json/eventos.json.php
	js/calendar/css/eventCalendar_theme.css