Pauls Backup restore at EAB
Merge branch 'master' of https://github.com/ssommerfeldt/TAC_EAB

Conflicts:
	Model/Entity Model/SalesLogix Application Entities/SalesOrder/QuickForms/SalesOrderProducts.main.quickform.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrder/QuickForms/SalesOrderProducts.main.quickform.xml.resx
	Model/Portal/SlxClient/SupportFiles/Bin/EAB_Custom.dll
	Model/project.info.xml
local update
Merge branch 'master' of https://github.com/ssommerfeldt/TAC_EAB

Conflicts:
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/QuickForms/ProductSearch.main.quickform.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/QuickForms/ProductSearch.main.quickform.xml.resx
Merge branch 'master' of https://github.com/ssommerfeldt/TAC_EAB

Conflicts:
	Model/Entity Model/SalesLogix Application Entities/SalesOrder/QuickForms/SalesOrderProducts.main.quickform.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/SKUSearch.method.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrderItem/UPCSearch.method.xml