Merge branch 'master' into feature_armario
Armario y rayo con camara