<back> feature in  inventory
Merge branch 'inventory'
some minor modifcations
Merge remote-tracking branch 'origin/master' into Bas