Merge branch 'third-tab-refactor' of github.com:unepwcmc/MacarthurWatersheds
d3 scales with super slim d3 custom build
latest changes to filters behaviour
reverted accidental code change from different branch
reverted accidental code change from different branch
Merge branch 'master' into d3-scales
compiling...
changed color-ramp
dynamic options for styling base layer
more dynamic configuration
fixed test
setActiveElement set on controller for all views
Merge pull request #13 from unepwcmc/third-tab-refactor-2

Third tab refactor 2
Merge pull request #14 from unepwcmc/d3-scales

D3 scales
using d3 linear scale to set line weight
moved getFilterOptionsWithSelectedSet into MacArthur object
Merge branch 'master' into zoom-dependent-style

Conflicts:
	index.html
Merge pull request #15 from unepwcmc/zoom-dependent-style

Zoom dependent style
function was not passing event in arguments
Merge branch 'master' of github.com:unepwcmc/MacarthurWatersheds