added uri.js
merge
Merge branch 'feature/refactor-june' of github.com:Vizzuality/gfw into feature/refactor-june
Merge branch 'feature/refactor-june' of github.com:Vizzuality/gfw into feature/refactor-june
first steps
forma layer
Merge branch 'feature/refactor-june' into refactor/canvas-json-layer

* feature/refactor-june:
  simple specs
  fixing some specs
  more layers with infowindow
  radio input forest change, a little rewrite
  added infowindow in all cartodb layers :)
  infowindow for logging layer
index map image
compressed index map images
canvasjson layer done and jshint passed
Merge pull request #629 from Vizzuality/refactor/canvas-json-layer

Refactor/canvas json layer
Merge pull request #630 from Vizzuality/feature/refactor-home-UI

Feature/refactor home ui
Merge branch 'feature/refactor-june' into refactor/test

* feature/refactor-june:
  canvasjson layer done and jshint passed
  compressed index map images
  index map image
  forma layer
  first steps
  added uri.js
enabling testem command