sin mas
dhc
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bumaye-android/assets/config.properties
	Bumaye-android/bin/Bumaye-android.apk
	Bumaye-android/bin/classes.dex
	Bumaye-android/bin/resources.ap_
	Bumaye-server/Bumaye-api/target/m2e-wtp/web-resources/META-INF/maven/ea.grupo2/Bumaye-api/pom.properties