wip
map: filters: rearrange filters, include #248 changes
stylesheets: prepare for clearfix
map: timeline: loss wip
map: timeline: loss: finished
maps: timeline: modis
Merge branch 'master' of github.com:Vizzuality/gfw

Conflicts:
	lib/assets/javascripts/gfw/gfw_lib.js.erb
Merge branch 'master' into fix/loss-timeline

Conflicts:
	app/views/static/about.html.erb
	app/views/static/howto.html.erb
	lib/assets/javascripts/gfw/gfw_lib.js.erb
map: timeline: forma wip
map: timeline: forma wip
maps: timeline: forma player
map: timeline: imazon
map: analysis: wip
map: analysis: country wip
map: analysis: geojson
Merge branch 'master' into fix/loss-timeline

Conflicts:
	app/views/shared/_js_templates.html.erb
	app/views/static/howto.html.erb
	lib/assets/javascripts/gfw/gfw_lib.js.erb
	lib/assets/javascripts/gfw/map_helpers.js.erb
assets precompile
map: loss: intensity
Merge pull request #270 from Vizzuality/fix/loss-timeline

Fix/loss timeline