merge design
borrar cache
Merge branch 'master' of https://github.com/25Horas/25horas into design