catalogo completo
Merge branch 'master' of github.com:felippeSales/lab3

Conflicts:
	lab3/.target/views/index.scala.html
	lab3/app/models/CatalogoDisciplinas.java
	lab3/app/models/Disciplina.java
	lab3/app/views/index.scala.html