teste do crud de turma
Merge remote-tracking branch 'origin/master'

Conflicts:
	SysProva/app/controllers/TurmaCrud.java
	SysProva/app/models/Turma.java
	SysProva/app/views/turma.scala.html
	SysProva/conf/routes