Commit post-merge se agregan archivos provenientes del
fetch remote
prueba
Merge branch 'Acta' of https://github.com/diego1982chile/app_custodia into Acta

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/outputFileStates.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.idea/libraries/play_services_6_1_71.xml
	.idea/libraries/support_annotations_20_0_0.xml
	.idea/libraries/support_v13_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	.idea/workspace.xml
	build/intermediates/dex-cache/cache.xml
	build/intermediates/model_data.bin
	local.properties
fixed untracked files