Teste
Merge branch 'fernando_noronha' of
https://github.com/fapereira1/make-a-wish.git into fernando_noronha

Conflicts:
	datastore-indexes-auto.xml
	src/main/java/com/ciandt/hackathon/resources/SetupServlet.java
Merge branch 'fernando_noronha' of
https://github.com/fapereira1/make-a-wish.git into fernando_noronha

Conflicts:
	datastore-indexes-auto.xml
	local_db.bin