reorganización y bloques header and footer
Merge remote-tracking branch 'origin/develop'