TesteConflito 2
Merge branch 'Denis' of https://github.com/abudbim/testegit into Denis
Comeco BD
Merge branch 'TesteDeArquivo' of https://github.com/abudbim/testegit into Denis

Conflicts:
	HeraMobile/AndroidManifest.xml
	HeraMobile/bin/AndroidManifest.xml
	HeraMobile/bin/Hera.apk
	HeraMobile/bin/classes.dex
	HeraMobile/bin/classes/com/hera/Localizacao.class
	HeraMobile/bin/classes/com/hera/MainActivity.class
	HeraMobile/bin/resources.ap_
	HeraMobile/res/layout/activity_main.xml
	HeraMobile/res/values/strings.xml
	HeraMobile/src/com/hera/Localizacao.java
	HeraMobile/src/com/hera/MainActivity.java
Mudando coisas