Classe Aluno
BDD
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	build/web/WEB-INF/classes/com/una/vdc/model/user/User.class
BDD
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	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/TIDIRStage.class
	build/web/WEB-INF/classes/com/una/vdc/model/project/Task.class
	build/web/WEB-INF/classes/com/una/vdc/model/user/MentorTeacher.class
	build/web/WEB-INF/classes/com/una/vdc/model/user/ModuleTeacher.class
	build/web/WEB-INF/classes/com/una/vdc/model/user/User.class
	build/web/WEB-INF/classes/com/una/vdc/persistence/dao/ModuleTeacherDAO.class
Integração Contínua