Merge branch 'master' of C:\data\RegistroCivil\RegistroCivil with conflicts.
Cambios para parametrizar el url del webservice
Merge remote-tracking branch 'origin/master'