exclusão de classe de modelo
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	build/web/WEB-INF/classes/com/una/vdc/model/CollegeClass.class
	build/web/WEB-INF/classes/com/una/vdc/model/Course.class
	build/web/WEB-INF/classes/com/una/vdc/model/Teacher.class
	build/web/WEB-INF/classes/com/una/vdc/services/TeacherService.class
Adequada a camada de modelo de acordo com o digrama de classes de domínio.
Atualizada classes de modelo
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	build/web/WEB-INF/classes/com/una/vdc/services/TeacherService.class
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/java/com/una/vdc/services/TeacherService.java
a
Revert "a"

This reverts commit fe3c2a791b668cc2ad26ff3da6aac2c610d0bec5.
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	build/web/WEB-INF/classes/com/una/vdc/bo/CollegeClassController.class
	build/web/WEB-INF/classes/com/una/vdc/bo/CoordinatorController.class
	build/web/WEB-INF/classes/com/una/vdc/bo/CourseController.class
	build/web/WEB-INF/classes/com/una/vdc/bo/StudentController.class
	build/web/WEB-INF/classes/com/una/vdc/model/course/CollegeClass.class
	build/web/WEB-INF/classes/com/una/vdc/model/course/Course.class
	build/web/WEB-INF/classes/com/una/vdc/model/course/Period.class
	build/web/WEB-INF/classes/com/una/vdc/model/project/TIDIRGroup.class
	build/web/WEB-INF/classes/com/una/vdc/model/project/TIDIRProject.class
	build/web/WEB-INF/classes/com/una/vdc/model/project/TIDIRStage.class
	build/web/WEB-INF/classes/com/una/vdc/model/project/Task.class
	build/web/WEB-INF/classes/com/una/vdc/principal/Principal.class
	build/web/WEB-INF/classes/com/una/vdc/services/TeacherService.class
	src/java/com/una/vdc/bo/CollegeClassController.java
	src/java/com/una/vdc/bo/CoordinatorController.java
	src/java/com/una/vdc/bo/CourseController.java
	src/java/com/una/vdc/bo/MentorTeacherController.java
	src/java/com/una/vdc/bo/StudentController.java
	src/java/com/una/vdc/model/course/CollegeClass.java
	src/java/com/una/vdc/model/course/Course.java
	src/java/com/una/vdc/model/course/Period.java
	src/java/com/una/vdc/model/project/TIDIRGroup.java
	src/java/com/una/vdc/model/project/TIDIRProject.java
	src/java/com/una/vdc/model/project/TIDIRStage.java
	src/java/com/una/vdc/model/project/Task.java
	src/java/com/una/vdc/model/user/Coordinator.java
	src/java/com/una/vdc/model/user/Guest.java
	src/java/com/una/vdc/model/user/MentorTeacher.java
	src/java/com/una/vdc/model/user/ModuleTeacher.java
	src/java/com/una/vdc/model/user/Student.java
	src/java/com/una/vdc/model/user/User.java
	src/java/com/una/vdc/persistence/dao/MentorTeacherDAO.java
	src/java/com/una/vdc/persistence/dao/ModuleTeacherDAO.java
	src/java/com/una/vdc/persistence/dao/ProjectDAO.java
	src/java/com/una/vdc/persistence/dao/StudentDAO.java
	src/java/com/una/vdc/persistence/dao/TIDIRStageDAO.java
	src/java/com/una/vdc/principal/Principal.java
varias coisas!
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	build/web/WEB-INF/classes/com/una/vdc/persistence/dao/GenericDAO.class
	build/web/WEB-INF/classes/com/una/vdc/principal/Principal.class
	src/java/com/una/vdc/dao/StudentDAO.java
	src/java/com/una/vdc/persistence/dao/GenericDAO.java
	src/java/com/una/vdc/services/TeacherService.java