Crud das disciplinas iniciado.. está com erros.. n percebo porque!
Merge branch 'views' of https://github.com/meiel/SAPUM into views

Conflicts:
	app/views/Disciplines/index.scala.html