Modificación
Merge remote-tracking branch 'origin/master'

Conflicts Floristeria/nbproject/private/private.properties