prepared GIS display, now properly reads from .shp and .dbf
Merge branch 'master' of https://github.com/kemlg/RiverBaSim

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/Infrastructure_Demo/.indexes/3b/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Infrastructure_Demo/.indexes/e4/fa/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Infrastructure_Demo/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/RiverBaSim/.indexes/3b/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/RiverBaSim/.indexes/7/ac/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/RiverBaSim/.indexes/e4/ac/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/RiverBaSim/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.jdt.core/173076447.index
	.metadata/.plugins/org.eclipse.jdt.core/2398501445.index
	.metadata/.plugins/org.eclipse.jdt.core/2906175955.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	Infrastructure_Demo/bin-groovy/infrastructuredemo/GasNode.class
	Infrastructure_Demo/bin-groovy/infrastructuredemo/ModelInitializer.class
	Infrastructure_Demo/docs/index.html
	RiverBaSim/bin/riverbasim/RiverSection.agent
	RiverBaSim/bin/riverbasim/RiverSection.groovy
	RiverBaSim/docs/.RiverSection.html
	RiverBaSim/docs/images/riverbasim.RiverSection.png
	RiverBaSim/docs/index.html
	RiverBaSim/docs/riverbasim.RiverSection.html
	RiverBaSim/src/riverbasim/RiverSection.agent
	RiverBaSim/src/riverbasim/RiverSection.groovy
	RiverBaSim/velocity.log