tablaataques
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bumaye-android/AndroidManifest.xml
	Bumaye-android/project.properties
	Bumaye-android/res/layout/activity_lista.xml
	Bumaye-android/src/ea/grupo2/Bumaye/android/ListaActivity.java
	Bumaye-android/src/ea/grupo2/Bumaye/android/MapActivity.java
	Bumaye-android/src/ea/grupo2/Bumaye/android/api/JugadorAdapter.java