Teste estudante.
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	build/web/WEB-INF/classes/com/una/vdc/model/course/Course.class
	build/web/WEB-INF/classes/com/una/vdc/persistence/dao/StudentDAO.class
	nbproject/private/private.xml
configuração alterada para persistencia no MySql
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	build/web/WEB-INF/classes/META-INF/persistence.xml
	build/web/WEB-INF/classes/com/una/vdc/model/course/Course.class
	build/web/WEB-INF/classes/com/una/vdc/persistence/dao/GenericDAO.class
	build/web/WEB-INF/classes/com/una/vdc/persistence/dao/StudentDAO.class
	nbproject/private/private.properties