Update of pick_and_place. Changes in pois and grasp states
Merge branch 'cris_branch' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge pull request #301 from reem-utils/cris_branch

Cris branch