developer1 conflict
Merge branch 'develop' of https://github.com/tagasouichiro/test_master into develop