Reparaciones
Reparaciones
Reparaciones
Merge remote-tracking branch 'origin/master'

Conflicts:
	AccessControl/grails-app/controllers/org/votingsystem/accesscontrol/controller/CertificateVSController.groovy
	AccessControl/grails-app/controllers/org/votingsystem/accesscontrol/controller/EventVSClaimCollectorController.groovy
	AccessControl/grails-app/controllers/org/votingsystem/accesscontrol/controller/EventVSController.groovy
	AccessControl/grails-app/controllers/org/votingsystem/accesscontrol/controller/EventVSElectionController.groovy
	AccessControl/grails-app/controllers/org/votingsystem/accesscontrol/controller/EventVSManifestCollectorController.groovy
	AccessControl/grails-app/services/org/votingsystem/accesscontrol/service/EventVSClaimService.groovy
	AccessControl/grails-app/services/org/votingsystem/accesscontrol/service/EventVSElectionService.groovy
	AccessControl/grails-app/services/org/votingsystem/accesscontrol/service/FieldEventVSService.groovy
	AccessControl/grails-app/services/org/votingsystem/accesscontrol/service/SubscriptionVSService.groovy
	AccessControl/grails-app/services/org/votingsystem/accesscontrol/service/TagVSService.groovy
	AccessControl/grails-app/services/org/votingsystem/accesscontrol/service/TimeStampVSService.groovy
	AccessControl/grails-app/services/org/votingsystem/accesscontrol/service/UserVSService.groovy
	AccessControl/grails-app/views/eventVSClaim/statistics.gsp
	AccessControl/grails-app/views/eventVSElection/statistics.gsp
	AccessControl/grails-app/views/eventVSManifest/_pdf.gsp
	AccessControl/grails-app/views/serverInfo/centrosCertificacion.gsp
	AccessControl/grails-app/views/serverInfo/informacion.gsp
	ControlCenter/grails-app/services/org/votingsystem/controlcenter/service/TagVSService.groovy
	ControlCenter/grails-app/services/org/votingsystem/controlcenter/service/UserVSService.groovy
	ControlCenter/grails-app/views/eventVSElection/eventVSElection.gsp
	ControlCenter/grails-app/views/serverInfo/testing.gsp
	TestsWebApp/src/groovy/org/votingsystem/simulation/callable/ManifestSignedSender.groovy
	TestsWebApp/web-app/images/Group_256x256.png
	TestsWebApp/web-app/images/cancel_16x16.png
	TestsWebApp/web-app/images/info_16x16.png
	VotingSystemLibrary/src/main/java/org/votingsystem/model/UserVS.java
	VotingSystemLibrary/src/main/java/org/votingsystem/util/FileUtils.java
	VotingSystemLibrary/src/main/java/org/votingsystem/util/StringUtils.java
	VotingToolAndroidProject/VotingToolAndroid/src/main/java/org/votingsystem/android/callable/AccessRequestor.java
	VotingToolAndroidProject/VotingToolAndroid/src/main/java/org/votingsystem/android/callable/DataGetter.java
	VotingToolAndroidProject/VotingToolAndroid/src/main/java/org/votingsystem/android/callable/PDFPublisher.java
	VotingToolAndroidProject/VotingToolAndroid/src/main/java/org/votingsystem/android/callable/SMIMESignedSender.java
	VotingToolAndroidProject/VotingToolAndroid/src/main/java/org/votingsystem/android/callable/SignedPDFSender.java
	VotingToolAndroidProject/VotingToolAndroid/src/main/java/org/votingsystem/android/callable/VoteSender.java
	VotingToolAndroidProject/VotingToolAndroid/src/main/java/org/votingsystem/android/model/AndroidContextVS.java
	VotingToolAndroidProject/VotingToolAndroid/src/main/java/org/votingsystem/android/model/KeyStoreVS.java
	VotingToolAndroidProject/VotingToolAndroid/src/main/java/org/votingsystem/android/model/ReceiptVS.java
	VotingToolApplet/src/main/java/org/votingsystem/applet/util/PdfFormHelper.java