Hibernate.cfg.xml on /resources/ folder
Merge branch 'master' of https://github.com/Mpro3Developer/Atelie

Conflicts:
	Socrates/src/main/java/br/unifenas/socrates/META-INF/hibernate.cfg.xml