Commit before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	ADAInstaller/bin/Release/ADAInstaller.msi
	ADAInstaller/bin/Release/ADAInstaller.wixpdb
	ADATest/bin/Release/ADATest.dll
	ADATest/bin/Release/ADATest.pdb
	ADATest/obj/Release/ADATest.csprojResolveAssemblyReference.cache
	ADATest/obj/Release/ADATest.dll
	ADATest/obj/Release/ADATest.pdb
	Ada GUI/SA/ExtensionMethods/StringExtensions.cs
	Ada GUI/TableParserEntrancePoint.cs
	Ada GUI/bin/Release/Ada.exe
	Ada GUI/bin/Release/Ada.pdb
	Ada GUI/obj/Release/Ada.exe
	Ada GUI/obj/Release/Ada.pdb
	Ada GUI/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache