Redid NavTools modifications.  Required modifications for Location information will be redone after we get the CSS modifications from Ken and Bruno.
A few more minor changes
Fix issues identified by Johann
More issues. Fix toolbars bug from Bruno.
Merge branch 'master' of https://github.com/GeoCanViz/GeoCanViz into navtoolbar-redo

Conflicts:
	demos/legend/config-map5.json
	src/js/gistasks/gisGeoprocessing.js
	src/js/gistasks/gisMapUtility.js

Resolve conflicts and some cleanup.
Merge pull request #35 from phuppe/navtoolbar-redo

Navtoolbar redo