merge conflicts
Merge conflicts
Merge conflicts
Merge branch 'master' of https://github.com/helpUfam/Educacional.git

Conflicts:
	AppEducacional/src/br/com/appeducacional/services/GetTurmasDisponiveisService.java