.

.
Merge branch 'master' of https://github.com/sdelacruz-ofimatic/MigrationAPP

Conflicts:
	.gradle/1.10/taskArtifacts/cache.properties.lock
	.gradle/1.10/taskArtifacts/fileHashes.bin
	.gradle/1.10/taskArtifacts/fileSnapshots.bin
	.gradle/1.10/taskArtifacts/outputFileStates.bin
	.gradle/1.10/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml