k
Merge branch 'master' of https://github.com/rpinzon/academic-net

Conflicts:
	src/main/java/br/infnet/academicnet/ui/AcademicNet.java
	src/main/java/br/infnet/academicnet/ui/FindTeacherUI.java
	src/main/java/br/infnet/academicnet/ui/NewClassRoomUI.java
	src/main/java/br/infnet/academicnet/ui/NewEnrollmentUI.java
	src/main/java/br/infnet/academicnet/ui/UpdateStudentUI.java
	src/main/java/br/infnet/academicnet/ui/UpdateTeacherUI.java