developer2 conflict

Please enter the commit message for your changes. Lines starting
Merge branch 'develop' of https://github.com/tagasouichiro/test_master into develop