Added new method to update the shelf's inventory after a robot returns it to its position
Merge branch 'master' of https://github.com/dieg0-/mas-2014ws-project