modified:   app/Controller/CalendariosController.php
	modified:   app/Controller/FaculdadesController.php
	modified:   app/Controller/MatriculasController.php
	modified:   app/Controller/MatriculasnotasController.php
	modified:   app/Controller/MatrizesController.php
	modified:   app/Controller/TurmasController.php
	new file:   app/Model/Avaliacao.php
	modified:   app/Model/Turma.php
	new file:   app/Test/Fixture/AvaliacaoFixture.php
	modified:   app/View/Calendarios/index.ctp
	modified:   app/View/Calendarios/view.ctp
	modified:   app/View/Matriculas/matriculas_turmas.ctp
	modified:   app/View/Matriculasnotas/adicionar.ctp
	modified:   app/View/Matriculasnotas/index.ctp
	modified:   app/View/Matrizes/index.ctp
Merge pull request #11 from juniorperfoll/171114_2200

	modified:   app/Controller/CalendariosController.php