US4 + ajustes
Merge branch 'master' of https://github.com/BrunoRafael7/lab4

Conflicts:
	DisciplinesManager/app/models/PlanoDeCurso.java
	DisciplinesManager/test/BehaviorTest.java