fixing some bugs in inventory management
Merge branch 'dev' into donation