Add home page and ficha static pages
Solve merge conflict