catkinize python_twoauth and voice_text, modify multi_map_server's catkin.cmake
Merge branch 'master' of https://github.com/jsk-ros-pkg/jsk_common into modify-and-catkinize-pkg

Conflicts:
	jsk_ros_patch/multi_map_server/catkin.cmake
delete python_twoauth
Merge pull request #518 from aginika/modify-and-catkinize-pkg

catkinize python_twoauth and voice_text, modify multi_map_server's catki...