Added Shelf - Picker communication
Merge branch 'master' of https://github.com/dieg0-/mas-2014ws-project
V.3.3.N00B. A lot of bla.
Merge branch 'master' of https://github.com/dieg0-/mas-2014ws-project
Merge remote-tracking branch 'upstream/master'