android cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bumaye-server/Bumaye-api/target/m2e-wtp/web-resources/META-INF/maven/ea.grupo2/Bumaye-api/pom.properties