#17 Ajustando
#11 Ajustando
Merge branch 'origin/master'

Conflicts:
	PI-Sistema/build/classes/br/edu/utfpr/cm/tsi/projetointegrador/DAO/HibernateConfiguration.class
	PI-Sistema/src/br/edu/utfpr/cm/tsi/projetointegrador/DAO/HibernateConfiguration.java