Target Cambio

Suir la version de 14 a 16
mapaVerificentro
pull
mapa

Verificentro
Merge branch 'master' of https://github.com/zenyagami/autochilango

Conflicts:
	AndroidManifest.xml
	project.properties
	src/com/hackdf/autochilango/MainActivity.java
Merge branch 'master' of https://github.com/zenyagami/autochilango

Conflicts:
	AndroidManifest.xml
	project.properties
	src/com/hackdf/autochilango/MainActivity.java
Merge branch 'master' of https://github.com/zenyagami/autochilango