Calendário
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Controller/CalendariosController.php
	app/Model/Calendario.php
	app/View/Calendarios/index.ctp