Some fixes
Merge branch 'master' of https://github.com/vkmerlin/OrderManagement

Conflicts:
	OrderManagement/App_Data/OMS.sdf