Agrego geolocation challa
Merge branch 'master' of https://github.com/dongraft/Traza

Conflicts:
	AndroidManifest.xml
	gen/cl/uchile/dcc/redes/traza/R.java