debugging
Merge branch 'master' into davida_products
fixes stock after paying problem
Merge branch 'davida_products'