full calendar cambio

full calendar cambio
Merge remote-tracking branch 'origin/master'

Conflicts:
	modulos/citas/Agenda/index.php