Merge conflict solved
Merge branch 'feature/landing-page' of github.com:Vizzuality/gfw into feature/landing-page