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

Conflicts:
	build/web/WEB-INF/classes/com/una/vdc/dao/GenericDAO.class
	build/web/WEB-INF/classes/com/una/vdc/model/Teacher.class