Bug with Add Laterals
Bug with Add Laterals
Resolved AA Versioning issue
Resolved AA bug with expression
Intersect and nearest feature fixes
Merge branch 'master' of https://github.com/Esri/local-government-desktop-addins

Conflicts:
	Address Desktop Tools/AddressManagementAddIn/Config.esriaddinx
	Attribute Assistant Add In/AttributeAssistantAddIn/Config.es-ES.xml
	Attribute Assistant Add In/AttributeAssistantAddIn/Config.esriaddinx
	GasUtilitiesDesktopAddIn/Config.esriaddinx
	Project Cost Estimating/Config.esriaddinx
	Water Utilities Desktop Tools/WaterUtilitiesDesktopAddIn/Config.es-ES.xml
	Water Utilities Desktop Tools/WaterUtilitiesDesktopAddIn/Config.esriaddinx
	Water Utilities Desktop Tools/WaterUtilitiesDesktopAddIn/Config.fr-FR.xml
	Water Utilities Desktop Tools/WaterUtilitiesDesktopFunctions/ConstructionTools.cs