no tocar admin,properties y quipucamayoc.js ni css
Merge remote-tracking branch 'origin/master'