adding serve_drink task to the scheduler
Merge branch 'master' of https://github.com/odestcj/hackathon_aug2013
deleted serve_drink_jun from the catkin package src directory.
first commit of serve_drink_jun rosbuild version.
Merge branch 'master' of https://github.com/odestcj/hackathon_aug2013
the scheduler code modified to adapt the new serve drink task.