fullcalendar
calendar
Merge branch 'master' of git@github.com:dtmonterrey/reserva-estudio.git

Conflicts:
	views/reserva/index.php
calendar