Ajustando classes com JPA
Merge branch 'bicicleta' of
https://github.com/fapereira1/make-a-wish.git into bicicleta

Conflicts:
	src/main/java/com/ciandt/hackathon/config/ConfigureDatabase.java
Merge branch 'bicicleta' of https://github.com/fapereira1/make-a-wish.git into bicicleta