Merge branch 'master' of github.com:Vizzuality/gfw into develop

* 'master' of github.com:Vizzuality/gfw:
  fix people data
Merge branch 'feature/new-country-page' of github.com:Vizzuality/gfw into develop

* 'feature/new-country-page' of github.com:Vizzuality/gfw:
custom infowindows on stories layers
user stories marker and custom marker
Merge pull request #706 from Vizzuality/refactor/stories-layers

Refactor/stories layers
Merge branch 'develop' into release/refactor

* develop:
  user stories marker and custom marker
  custom infowindows on stories layers