Modificacion en Master

Alternando Proyectos
Merge remote-tracking branch 'origin/Dev'
Merge remote-tracking branch 'origin/master' into Dev
Merge remote-tracking branch 'origin/master' into Dev