Changes made by Maria Cecilia (maria.cecilia@exla.com.br).
Merge branch 'master' of https://github.com/hanashiro/mgResponsavel.git

Conflicts:
	mgResponsavel/paginas/alunoOcorrencia.html
Merge branch 'master' of https://github.com/hanashiro/mgResponsavel.git