Added pick and place in basic_functionalities
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge branch 'cris_branch'