peste
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bumaye-android/project.properties
	Bumaye-android/src/ea/grupo2/Bumaye/android/ListaActivity.java