add view_controller_msgs
add baxter_common
fix conflict