ez
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bumaye-android/AndroidManifest.xml
	Bumaye-android/src/ea/grupo2/Bumaye/android/InventarioActivity.java