fix grunt command watch:scripts
reutilize query and style KHa, non decimal amounts
Merge branch 'feature/new-country-page' of github.com:Vizzuality/gfw into refactor/bio-hazard-mix
wip sauce
Merge branch 'feature/refactor-june' of github.com:Vizzuality/gfw into refactor/bio-hazard-mix
wip: yanked out nsa, added DataService
wip: mps for analysis service
wip: docs for analysis service
wip tests
wip more test
cleanup
added cartodb and gee logos
remove CacheService ish
Merge pull request #652 from Vizzuality/feature/nsa-ttl

Add TTL caching strategy
Merge branch 'feature/refactor-june' of github.com:Vizzuality/gfw into refactor/bio-hazard-mix
Merge branch 'refactor/bio-hazard-mix' of github.com:Vizzuality/gfw into refactor/analysis
test analysis