Merge branch 'gui_curtis' of https://github.com/EagleCreekDrupalTeam/EagleCreekSiteMapAnalyzer into gui_curtis

Conflicts:
	nbproject/private/private.properties