prueba
Merge branch 'master' of https://github.com/GuinetPro/core_new
cambios