rename delivery to vm delivery and pickup delivery
Merge branch 'concert_common_services' of https://github.com/robotics-in-concert/rocon_demos into concert_common_services