Merge branch 'master' of https://github.com/jscott11/solutions-geoprocessing-toolbox into jscott11-master

Conflicts:
	analysis/toolboxes/Incident Analysis Tools.tbx
Merge pull request #68 from mfunk/master

Merge branch 'master' of https://github.com/jscott11/solutions-geoproces...