He realizado PersonaTest
Merge remote-tracking branch 'origin/master'
Resolved merge conflicts between master and release1.0