modified:   app/Config/core.php
	modified:   app/Controller/CalendariosController.php
	modified:   app/Controller/ColaboradorsController.php
	modified:   app/Controller/MatrizesController.php
	modified:   app/Model/Calendario.php
	modified:   app/Model/Matrize.php
	modified:   app/View/Calendarios/view.ctp
	modified:   app/View/Layouts/login.ctp
	modified:   app/View/Matrizes/index.ctp
	modified:   app/webroot/js/calendar.js
Merge pull request #12 from juniorperfoll/181114_1850

	modified:   app/Config/core.php