added stuff to package.xml and CMakeLists.txt so that it's somewhat complete
Fixed missing merge in WorldManager.py
Fixed merge conflict in object_filename_dict
Added grasp_message_robot_server.py implementation