Merge branch 'master', remote-tracking branch 'upstream' into topic/styling-cleanup
Fix scrolling thumbnails for tree image carousel
Merge pull request #858 from mtedeschi/topic/styling-cleanup

Styling cleanup/bug fixes
Merge branch 'master', remote-tracking branch 'upstream'
Merge branch 'master' of github.com:mtedeschi/OTM2

Conflicts:
	opentreemap/treemap/css/sass/partials/_treedetails.scss