Ajustes
Tentativa de commit
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/services/StudentService.class
	src/java/com/una/vdc/services/StudentService.java
Muita alteração náo entendo o porque