Subo lo nuevo

Subo los cambios
Subo los cambios
Merge branch 'master' of https://github.com/mdalmao/AppMovil

Conflicts:
	bin/StackOverflow.apk
	bin/classes.dex
	bin/classes/com/example/stackoverflow/DetalleTema.class
	bin/classes/com/example/stackoverflow/MainActivity.class
	bin/classes/com/example/stackoverflow/R$id.class
	bin/classes/com/example/stackoverflow/R$integer.class
	bin/classes/com/example/stackoverflow/R$layout.class
	bin/classes/com/example/stackoverflow/R$menu.class
	bin/classes/com/example/stackoverflow/R$string.class
	bin/classes/com/example/stackoverflow/R$style.class
	bin/classes/com/example/stackoverflow/TemaBuscar.class
	bin/classes/com/example/stackoverflow/TemaInfo.class
	bin/classes/com/example/stackoverflow/TemaRespuesta$MyLocationListener.class
	bin/classes/com/example/stackoverflow/TemaRespuesta.class
	bin/classes/com/example/stackoverflow/Temanuevo.class
	bin/classes/modelo/DatabaseManager.class
	bin/classes/modelo/ListRespuesta.class
	bin/classes/modelo/ListTemas.class
	bin/resources.ap_
	gen/com/example/stackoverflow/R.java
	res/layout/activity_detalle_tema.xml
	res/values/strings.xml
	src/com/example/stackoverflow/DetalleTema.java
	src/com/example/stackoverflow/TemaBuscar.java
	src/modelo/DatabaseManager.java