backbone routing test
set and choose scales - dummy data
add scale notice under tabs
fixed tests
Merge branch 'scale' into router

Conflicts:
	coffee/src/controllers/main_controller.coffee
	gulpfile.js
	js/application.js
	js/tests.js
backbone navigation
Update README.md
new data
new data
broken navigation
styling for scales
Merge branch 'scale' of https://github.com/unepwcmc/MacarthurWatersheds into scale

Conflicts:
	coffee/src/templates/scale_chooser.hbs
	js/templates.js
added styling tweaks for the second screen and styled navigation elements
Improved data import
Fixed scale interactions
Merge branch 'scale' of github.com:unepwcmc/MacarthurWatersheds into scale
bug fix
remove goback and some consoles
Merge branch 'scale'

Conflicts:
	data/GLR.topo.json
	data/MEK.topo.json
	data/WAN.topo.json
	data/json/GLR.geojson
	data/json/MEK.geojson
	data/json/WAN.geojson
Merge branch 'master' of github.com:unepwcmc/MacarthurWatersheds

Conflicts:
	README.md
Merge branch 'master' into production

Conflicts:
	index.html