atualizacao
teste
Merge branch 'quarto_tematico' of
https://github.com/fapereira1/make-a-wish.git into quarto_tematico

Conflicts:
	datastore-indexes-auto.xml
	local_db.bin
	src/main/java/com/ciandt/hackathon/config/GuiceServletConfig.java