Merge branch 'master' of https://github.com/natoehv/emergenciAPPS

Conflicts:
	emergenciAPPS/bin/classes.dex
	emergenciAPPS/bin/emergenciAPPS.apk
	emergenciAPPS/bin/resources.ap_
	emergenciAPPS/src/com/example/emergenciapps/EmergenciaAPPSActivity.java
Se genera emergencia mejorado
Merge branch 'master' of https://github.com/natoehv/emergenciAPPS