Change at Replacement of URI in tool_convert
Merge branch 'master' of git://github.com/mmukai/zomeki-development into mmukai-master
Merge branch 'mmukai-master'