update of manipulation
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into chang_branch
Updating grasping states: pick, place, object_detection_and_grasping
Updating object_detection states
Updating Emergency Situation state machines