add Magento Id and SKU Fields to Forms
Merge branch 'master' of github.com:ssommerfeldt/TAC_LYKKI

Conflicts:
	SSIS/X3SLXProductCatalog/X3SLXProductCatalog/X3SLXProductCatalog.suo
	SSIS/X3_SLX_SalesOrderItems/X3_SLX_SalesOrderItems.suo