Merge branch 'feature/refactor-june-davidsingal' into feature/refactor-june

* feature/refactor-june-davidsingal:
  jshint
  test and grunt
  recovery testem.yml
  vacuum cleaner
  add capybara-screenshot
  update for filter tests on map page
  changes for countries
clean
resolve conflict
merge
added editorconfig and format url params
Merge branch 'feature/refactor-june' of github.com:Vizzuality/gfw into feature/refactor-june-davidsingal

* 'feature/refactor-june' of github.com:Vizzuality/gfw:
  Timeline presenter
Merge pull request #588 from Vizzuality/feature/refactor-june-davidsingal

editorconfig.org and format url