---arrumei
--Merge branch 'master' of https://github.com/marcosalles/eps-2013

Conflicts:
	bd/TrabalhoBD/nbproject/private/private.xml
	bd/TrabalhoBD/src/hibernate.cfg.xml