aaaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/generated/source/r/debug/union/union_vr1/R.java
	app/src/main/AndroidManifest.xml
	app/src/main/res/layout/login.xml
	build/intermediates/model_data.bin
Cobros por todo