upd modelo de datos varios
Merge remote-tracking branch 'upstream/master'