ACDDLED
Merge branch 'master' of https://github.com/T2VSoft/AimtecCustomProducts

Conflicts:
	CustomProducts/Controllers/CustomProductsController.cs
	CustomProducts/Views/CustomProducts/ACACConverterEntry.cshtml
	CustomProducts/Views/CustomProducts/BasicProductForm.cshtml
	CustomProducts/bin/CustomProducts.dll
	CustomProducts/bin/CustomProducts.pdb
	CustomProducts/bin/Resources.dll
	CustomProducts/bin/Resources.pdb
	CustomProducts/bin/zh-TW/Resources.resources.dll
	CustomProducts/obj/Debug/CustomProducts.csprojResolveAssemblyReference.cache
	CustomProducts/obj/Debug/CustomProducts.dll
	CustomProducts/obj/Debug/CustomProducts.pdb
	Resources/bin/Debug/Resources.dll
	Resources/bin/Debug/Resources.pdb
	Resources/bin/Debug/zh-TW/Resources.resources.dll
	Resources/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Resources/obj/Debug/Resources.csprojResolveAssemblyReference.cache
	Resources/obj/Debug/Resources.dll
	Resources/obj/Debug/Resources.pdb
	Resources/obj/Debug/zh-TW/Resources.resources.dll