Merge branch 'master' of https://github.com/takuyozora/publiphoto.git