Merge branch 'master' of https://github.com/uguisu-an/sample_app