wip
Merge branch 'master' into fix/fixes

Conflicts:
	app/assets/javascripts/countries.js
	app/assets/stylesheets/application.scss
Merge branch 'master' of github.com:Vizzuality/gfw
Merge branch 'master' of github.com:Vizzuality/gfw
fix typo