Alteração Atividade Filipe Germano
Aula
commit
Merge branch 'dev-001' of https://github.com/DiegoEP/DAC-2013-2

Conflicts:
	2-Mapeamento Objeto Relacional/locashow/locashow-ejb/target/classes/br/edu/ifpb/negocio/Fachada.class
	2-Mapeamento Objeto Relacional/locashow/locashow-ejb/target/classes/br/edu/ifpb/negocio/FachadaLocal.class
	2-Mapeamento Objeto Relacional/locashow/locashow-web/target/classes/br/edu/ifpb/HelloServlet.class